Use address names from addresses.h

Again, no logic changes, just replacing some addresses with #defined names.
(I wrote [a small utility for finding all of them](https://gist.github.com/adrian17/fcd559a8026a2c8d063e), could be useful to avoid omitting them in the future)