Improve diagnostics a bit.