Argument count wasn't checked before checking/parsing each optional
argument.

Also noticed/ that the 'match_del' parameter added in commit
e61eb77b didn't advance the argument index, fixed that issue.