After-merge fixes.
Simplify hard error handling code.

Sponsored by:	Netflix
Sponsored by:	Nginx, Inc.