Edits by request.
Merge pull request #7 from BarAgent/requested-edits

Compatibility fixes for command-line-definer macro
Bug fixes for <repeated-parameter-option> option type, and general <option> types from macro.