Agreed, that's actually copied from the [original version](https://github.com/aws/aws-cli/blob/develop/awscli/clidriver.py#L156) but I'll pull these up to instance vars.