Separate CLI options and locals

[closes #1652]
[see #1672]

Improved upon #1672 by giving a possibility for users to specify options as well as locals.

This PR targets the v2 branch.