NameAddrHeader first cut and URI tweaks.