MFC r273281:
 Style changes as pointed out by stas@.
Merge remote-tracking branch 'freebsd/stable/10' into hardened/10/aslr