Assorted improvements to diagnostics.