Simplify parser, small speed increase