Go rid of match object in AST and simply inlined its contents