make empty addresses work better
make empty addresses work better

code-and-effect/effective_addresses,rosskevin/effective_addresses,code-and-effect/effective_addresses,rosskevin/effective_addresses,code-and-effect/effective_addresses,rosskevin/effective_addresses