Further refactor the section_name/current_item stuff