Add command line option handling to more subcommands.