pp + cleanup transform patterns + prepare for new function syntax