Modified ShallowCopier to make use of new makeStub() methods