Avoid nested regexp match capturing
Clarify argument list handling