Switch over warning / deprecation helpers to support

Note the other 3 commits related to hiding warnings generated by mocks which previously we weren't being warned about