Windows build fixes, hopefully last part.

r198153 fixed the msvs bot problem, but broke a msysgit bot. This change
hopefully makes both variants happy.