ah cool. If reset is always available we should update makeStubMethod to hook into _cleanups like makeContainer then. Diff branch though.