Cleanup of various untidy bits.