More closely match ed error semantics/messages.