Improving the debugging output.