3.3: In Cpp.Token module, minor changes in error messages.