Not sure about this... Too many DEBUG lines are there to fix each one separately, including new future ones.
Perhaps it's better to fix DEBUG macro itself