xsd-fu: Correct C++ metadata store types