Another go at the overlong-addrs versus rewrites problem