Just instantiate the class direclty, none of this `self.__class__` indirection