Change approach to adding a metaclass to six.add_metaclass, update metaclasses to not look for NewBase