Merge "Rename an internal method to _helper_list()"