avoid AST roundtrip in extractor transformation
detect catch-all cases in extractor handler and avoid code duplication