Restore -o and make explicit it means 'options local to subcommand' (Closes #182)