Cleanup alternate_values_controller/helper and misc. minor edits.