Restore the original check for doing an arg list