Finish program options cleanup.
Merge branch 'master' into force