Minor diagnostic-related tweaks.