Landed some small clean-ups, please do test -head

[Adrian Chadd]

hi!

I just landed a few clean-ups, nothing major. If you're running -HEAD then
I'd appreciate if you could update user/kernel today and just make sure
nothing has gone sideways.

Thanks!



-adrian