id: Clean up

No functional change intended.

Approved by: re (cperciva)
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D53300

(cherry picked from commit 70b72ede982f3aebe03a2bf7a8245ee6bcde352c)
(cherry picked from commit 758e4565a9d61644a3a7e5dc517612df1617f231)