Handle non-addrspec addressing headers better.