More StrangeIOC Cleanup

Getting closer to good/consistent patterns to use