Can someone test this small cleanup with trunk on MS-Windows?
This looks correct, but I can't verify it myself.

Dmitry