Reorder matching lists and remove debugging exceptions.