Change-Id: Iaafa78a17580d962e260d9553b11d2cd3cb4726f Also: quiet MSVC warnings that suggest making code non-portable.