Move definitinion of DEFMETHOD to early in the build process.
Add mop-class-hierarchy as component in phase 2.