Remove a ton of special-case error_logger invocations