Multiple -sg and -sn Commandline Parameters - Step 3

Third pull request to implement issue #401.

Extend the implementation to CommandLineArguments. The goal here is to change the code "under the hood", while everything else is still working as before.

To this end, a small amount of "temporary workaround code" was introduced. This is eliminated as changes progress..