Fixing more uses of DEBUG.