incorporate @colinta's Creator patch

Forcing everything to go through an AddrBook instance.