Make error handler sigs clearer.