Improve error messages and add qualifier token type.