Work around an ICE in Clang 3.7.0 on Windows/x86

The previous fix was incomplete.