Continue parser refactorings.