Re #6314. Fix Windows builds.