Improved error reporting in UVSS lexer/parser