Attempting to fix r205124, which had failed asserts when built with MSVC.

Suggestion from Yaron Keren.