[Issue 8730] Fixes to Debug() macro usage