Fixup for diag push macros (Fixes #86 I think)