More minor cleanup.