minor, allow mandatory option decls in the usage line

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
fix, PEBKAC, use more inconspicuous identifiers for calls into the foreach* family ...

lest we interfere with user data.

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'core/dsl'

* core/dsl:
  fix, PEBKAC, use more inconspicuous identifiers for calls into the foreach* family ...
  minor, allow mandatory option decls in the usage line