Minor cleanup.
Vogltest on Windows.