Diagnostic tweaks

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