Macro-ed debug print out

Make debug print in macro, so can be easily stripped out of the code