Some little tidy-ups on the codebase.

A few little tidy-ups.

-=david=-