re #10666 improve formatting on windows