Re-added C style argv checks.