*Windows specific code left out as I don't yet have a build environment to
test the change.