Reordering functions and renaming predicates.