More minor cleanup and tinkering.