Mostly attempting to maintain convention I saw in `ec2/instance.py` and `ec2/instanceinfo.py`

Either works for me.