Slightly improved diagnostics.