Changed instantiation to not be so sloppy for instantiateShapes().