Tweak to ensure parentCancel is cleaned up
Tweak wrapping of super resolve and reject and minor refactoring to make testing easier