Fix errors due to renaming *list to *_list.