Some code tidying, use macros in a few more places.

2 files changed