Separate CLI options and locals

[closes #1652]