#22: moved reserved class names out of parser.cpp and into data.cpp