remove insane nesting of closures in xform parser

see https://github.com/dimagi/Vellum/pull/96

github seems a little confused about the commits... weird, I've definitely rebased off cleanup, will try rebasing off master but it shouldn't do anything