Agreed; this is a lot cleaner.  I like the cmd_options dictionary.