More refactoring of render_list.