Change the macros to meet boost guidelines.
I should really have done this before the review. At least it'll give them something to say.