More complexity reduction in the Parser class