Support list of options with a trailing argument

Fixes 3 of 4 language agnostic tests.