Additional testing for addr.c and a consequent bug fix.