Clean up some nits.