WIP. Trying to improve parser error messages.