Use macros defined in addresses.h. Removed one doubled macro.