remove insane nesting of closures in xform parser

MERGE AFTER https://github.com/dimagi/Vellum/pull/95