Move line matching out of LineParsers