Finalizing Enhanced Elastic IPs.

Last minute changes to simply the branching conditionals relating to Elastic IPs enhanced functionaility additions.