Prepare less hairy subcommand resolution
Prepare less hairy subcommand resolution

jparyani/Mailpile,jparyani/Mailpile,jparyani/Mailpile,laborautonomo/Mailpile,laborautonomo/Mailpile,laborautonomo/Mailpile