Partial revert of 187310; it seems MSVC 10 still spits out this warning, but MSVC 11 does not.