Moving CLI-specific stuff to awscli.