potential fix for compiler error on win32 platform

I really don't like this fix. Pulling logic like this into these submodules is irksome. Open to better ideas!

This will also cause coverage to sink below 100% until we enable a windows build slave.