Support one or many optional arguments.

 Fixes 1 of 4 language agnostic tests