Tidy some of the debug output.