Minor changes to diagnostic output.