Provisions for EC2/VPC differences, clean up of the address v addressId confusion.