Fixing a detail in grammar and Data.cpp