Parser tweaking and refactoring.