remove insane nesting of closures in parser