Fixes #5601 Do not append extra args when checking for pip command options