Random cleanups.

Ronseal.  Nothing too exciting.  Added a test or two.