one more refactor; simplify watcher struct
one more refactor; simplify watcher struct

mjs/juju,sinzui/juju,frobware/juju,kat-co/juju,waigani/juju,tasdomas/juju,perrito666/juju,kat-co/juju,cloud-green/juju,mhilton/juju,AdamIsrael/juju,cmars/juju,kat-co/juju,dimitern/juju,ericsnowcurrently/juju,Altoros/juju-cloudsigma,Altoros/juju-cloudsigma,voidspace/juju,tasdomas/juju,mjs/juju,perrito666/juju,tych0/juju,bac/juju,frankban/juju,ericsnowcurrently/juju,voidspace/juju,dimitern/juju,jrwren/juju,bogdanteleaga/juju,axw/juju,mhilton/juju-juju,marcmolla/juju,gabriel-samfira/juju,macgreagoir/juju,Altoros/juju-vmware,howbazaar/juju,reedobrien/juju,cherylj/juju,reedobrien/juju,Altoros/juju-vmware,tych0/juju,reedobrien/juju,mikemccracken/juju,ericsnowcurrently/juju,dooferlad/juju,perrito666/juju,macgreagoir/juju,wwitzel3/juju,howbazaar/juju,bz2/juju,wwitzel3/juju,fwereade/juju,frankban/juju-tmp,mhilton/juju,Altoros/juju-vmware,cherylj/juju,tych0/juju,marcoceppi/juju,reedobrien/juju,dooferlad/juju,frankban/juju,sinzui/juju,sinzui/juju,dimitern/juju,frobware/juju,alesstimec/juju,voidspace/juju,alesstimec/juju,alesstimec/juju,marcmolla/juju,waigani/juju,marcmolla/juju,gabriel-samfira/juju,anastasiamac/juju,ericsnowcurrently/juju,bac/juju,mjs/juju,howbazaar/juju,dooferlad/juju,kat-co/juju,gabriel-samfira/juju,alesstimec/juju,jrwren/juju,bogdanteleaga/juju,macgreagoir/juju,gabriel-samfira/juju,waigani/juju,cmars/juju,thomnico/juju,marcoceppi/juju,AdamIsrael/juju,bogdanteleaga/juju,dooferlad/juju,frankban/juju-tmp,bac/juju,kat-co/juju,anastasiamac/juju,bz2/juju,macgreagoir/juju,frankban/juju,wwitzel3/juju,ericsnowcurrently/juju,axw/juju,sinzui/juju,thomnico/juju,mhilton/juju,dimitern/juju,axw/juju,davecheney/juju,bz2/juju,tsakas/juju,makyo/juju,fwereade/juju,mjs/juju,cherylj/juju,makyo/juju,tasdomas/juju,howbazaar/juju,Altoros/juju-vmware,dimitern/juju,bac/juju,mikemccracken/juju,davecheney/juju,marcoceppi/juju,anastasiamac/juju,mjs/juju,dooferlad/juju,marcmolla/juju,cmars/juju,makyo/juju,jrwren/juju,cloud-green/juju,waigani/juju,gabriel-samfira/juju,thomnico/juju,mhilton/juju,tsakas/juju,fwereade/juju,cmars/juju,axw/juju,frankban/juju-tmp,davecheney/juju,AdamIsrael/juju,howbazaar/juju,anastasiamac/juju,mhilton/juju-juju,thomnico/juju,tsakas/juju,macgreagoir/juju,AdamIsrael/juju,mjs/juju,frankban/juju,marcoceppi/juju,perrito666/juju,cloud-green/juju,voidspace/juju,tych0/juju,perrito666/juju,alesstimec/juju,bogdanteleaga/juju,frankban/juju-tmp,tsakas/juju,mikemccracken/juju,mikemccracken/juju,fwereade/juju,frankban/juju,axw/juju,Altoros/juju-cloudsigma,mjs/juju,wwitzel3/juju,tasdomas/juju,bz2/juju,Altoros/juju-cloudsigma,mhilton/juju-juju,mikemccracken/juju,mhilton/juju-juju,bz2/juju,davecheney/juju,reedobrien/juju,anastasiamac/juju,marcmolla/juju,cloud-green/juju,cherylj/juju,makyo/juju,bac/juju,frobware/juju