Use new argument checking conditions.