Looks like it was the use in type_check.h that was still causing problems, not that MSVC doesn't short-circuit #if statements. Change-Id: I574e8dd463c46b0133a989b221a7bb8861b3eed9
Adam Langley