Minor refactoring in the "parser" module