Some little tidy-ups on the codebase.

-=david=-