Improved error message for syntax error: the list of expected tokens was sometimes not set correctly.
