Minor refactor
Line info in parse errors