(PUP-2755) Remove special handling of iterative functions / cleanup
This fixes comments from review. It also removes the special
handling of the iterative functions (special case to avoid
having their arguments transformed) as this is no longer needed.