Better handling of spurious arguments on windows