Cleanup of Windows check, begin CMD arguments

But the former is broken.