The structure for storing statement information is now a C++ class. At least initially it will not be turned into a full-fledged class that would contain all functionality, but the code will be a mishmash of C and C++.
MXS-1307 requries some modifications in the query classifier and making those changes is easier if STL collections are available.