Moving more code into OOXMLObject infrastructure