Internal refactoring on Parser.cs.