Diagnostic tweaks

Fix some old papercuts with diagnostics, e.g. tweaking spans, rewording messages. See individual commits.