s3: Remove a few uses of cli_errstr