No need to redefine MAKE-INSTANCE after all.