Fix a couple of name-clash bugs, and write a passlet that converts functions to natural loop form (mostly working, still some outstanding bugs)