Make the parser terser & more performant