DEBUG3 is really just DEBUG2 with a tweak. Should we bite the bullet and clean this up so there is just one macro and a flag that can be passed to activate it?