Consistent use of sformat in address-related files