and use DEBUG like everywhere else. There were already some TEST lines
using this scheme.

Also indent DEBUG and TEST lines to make the code more readable