Cleanup, mostly.

Odd bits of untouched nasties.