I started to fix this, but it hurts code readability too much to move the DEBUG and ENDDEBUG to the places where they would get rid of the whitespace.