Use macros defined in addresses.h where possible. Removed one doubled macro.
Merge branch 'adrian17-master'