Remove extraneous error types.
Further simplify error handling.