Minor refactoring to handle vpc-id "" and "none" properly.
Minor refactoring to handle vpc-id "" and "none" properly.

mjs/juju,marcmolla/juju,reedobrien/juju,dooferlad/juju,mjs/juju,bz2/juju,AdamIsrael/juju,marcmolla/juju,howbazaar/juju,perrito666/juju,mikemccracken/juju,AdamIsrael/juju,kat-co/juju,kat-co/juju,ericsnowcurrently/juju,mikemccracken/juju,perrito666/juju,howbazaar/juju,kat-co/juju,bac/juju,macgreagoir/juju,reedobrien/juju,frankban/juju,waigani/juju,reedobrien/juju,dooferlad/juju,axw/juju,reedobrien/juju,waigani/juju,gabriel-samfira/juju,kat-co/juju,axw/juju,bac/juju,dimitern/juju,anastasiamac/juju,AdamIsrael/juju,mikemccracken/juju,frankban/juju,ericsnowcurrently/juju,gabriel-samfira/juju,alesstimec/juju,gabriel-samfira/juju,howbazaar/juju,howbazaar/juju,marcmolla/juju,dimitern/juju,bz2/juju,alesstimec/juju,perrito666/juju,macgreagoir/juju,alesstimec/juju,anastasiamac/juju,bac/juju,anastasiamac/juju,macgreagoir/juju,gabriel-samfira/juju,bz2/juju,dimitern/juju,waigani/juju,mjs/juju,dooferlad/juju,perrito666/juju,alesstimec/juju,anastasiamac/juju,howbazaar/juju,macgreagoir/juju,anastasiamac/juju,mjs/juju,marcmolla/juju,mjs/juju,kat-co/juju,ericsnowcurrently/juju,mikemccracken/juju,gabriel-samfira/juju,alesstimec/juju,frankban/juju,marcmolla/juju,bz2/juju,axw/juju,dooferlad/juju,axw/juju,dooferlad/juju,waigani/juju,mjs/juju,ericsnowcurrently/juju,axw/juju,bac/juju,reedobrien/juju,frankban/juju,ericsnowcurrently/juju,perrito666/juju,dimitern/juju,mjs/juju,dimitern/juju,bac/juju,AdamIsrael/juju,bz2/juju,frankban/juju,mikemccracken/juju,macgreagoir/juju