Clean up miscellaneous minor stuff.