Minor refactoring in parse.c