Fix ripple effects from port to Windows. Clang doesn't like the way we instantiated static template members. Rightly so, as we weren't doing it the right way.