Remove a deprecation. Refactor error messages.