attempting to get windows working with these changes, take 3.

this one adds instrumentation so I can try to track down where things
are going wrong on the bots.