Make DEBUG handling work a bit better.