Strip the copy-and-paste for cfg-parser, keeping the delta vs. parser.