And here I thought 16 macros of mine across all class are too many...@-@