Improved diagnostic print-out.