(MERGE AFTER #95) remove insane nesting of closures in xform parser

this is in preparation for the QR code question type