Refactor for more euca2ools-ness