Simplify terminal parsers