Move class-instantiation dispatch out of XFormInstance