diff --git a/src/VisualStudio/Setup.Next/codeAnalysisService64.servicehub.service.json b/src/VisualStudio/Setup.Next/codeAnalysisService64.servicehub.service.json
index 92d07291882519be2e61e2cd211637036207d978..5901a5bf5e8aa4564ce1c3fcf20573a217936839 100644
--- a/src/VisualStudio/Setup.Next/codeAnalysisService64.servicehub.service.json
+++ b/src/VisualStudio/Setup.Next/codeAnalysisService64.servicehub.service.json
@@ -1,6 +1,6 @@
 {
   "host": "desktopClr",
-  "hostId": "RoslynCodeAnalysisService64",
+  "hostId": "RoslynCodeAnalysisService",
   "hostGroupAllowed": true,
   "entryPoint": {
     "assemblyPath": "Microsoft.CodeAnalysis.Remote.ServiceHub.dll",
diff --git a/src/VisualStudio/Setup.Next/remoteHostService64.servicehub.service.json b/src/VisualStudio/Setup.Next/remoteHostService64.servicehub.service.json
index bf8ae0ea7a9ff22edb78e76fd0a17266f8d8bc3a..0b436bfef50711271805747339bc851110f7a379 100644
--- a/src/VisualStudio/Setup.Next/remoteHostService64.servicehub.service.json
+++ b/src/VisualStudio/Setup.Next/remoteHostService64.servicehub.service.json
@@ -1,6 +1,6 @@
 {
   "host": "desktopClr",
-  "hostId": "RoslynCodeAnalysisService64",
+  "hostId": "RoslynCodeAnalysisService",
   "hostGroupAllowed": true,
   "entryPoint": {
     "assemblyPath": "Microsoft.CodeAnalysis.Remote.ServiceHub.dll",
diff --git a/src/VisualStudio/Setup.Next/remoteSymbolSearchUpdateEngine64.servicehub.service.json b/src/VisualStudio/Setup.Next/remoteSymbolSearchUpdateEngine64.servicehub.service.json
index 67cc5e2b0466479da4c2ba46d0d395a13589f186..99b3dca9b43a32573630614ac4d908fec655742f 100644
--- a/src/VisualStudio/Setup.Next/remoteSymbolSearchUpdateEngine64.servicehub.service.json
+++ b/src/VisualStudio/Setup.Next/remoteSymbolSearchUpdateEngine64.servicehub.service.json
@@ -1,6 +1,6 @@
 {
   "host": "desktopClr",
-  "hostId": "RoslynCodeAnalysisService64",
+  "hostId": "RoslynCodeAnalysisService",
   "hostGroupAllowed": true,
   "entryPoint": {
     "assemblyPath": "Microsoft.CodeAnalysis.Remote.ServiceHub.dll",
diff --git a/src/VisualStudio/Setup.Next/snapshotService64.servicehub.service.json b/src/VisualStudio/Setup.Next/snapshotService64.servicehub.service.json
index a9aaeef43d77c44fc886a63eea9ae2d5f623f555..8975e0b2cf6d18c60e44762f66ea419e39fa9f3a 100644
--- a/src/VisualStudio/Setup.Next/snapshotService64.servicehub.service.json
+++ b/src/VisualStudio/Setup.Next/snapshotService64.servicehub.service.json
@@ -1,6 +1,6 @@
 {
   "host": "desktopClr",
-  "hostId": "RoslynCodeAnalysisService64",
+  "hostId": "RoslynCodeAnalysisService",
   "hostGroupAllowed": true,
   "entryPoint": {
     "assemblyPath": "Microsoft.CodeAnalysis.Remote.ServiceHub.dll",
diff --git a/src/Workspaces/Remote/ServiceHub/Services/CodeAnalysisService_Diagnostics.cs b/src/Workspaces/Remote/ServiceHub/Services/CodeAnalysisService_Diagnostics.cs
index f1ac53f0a46c571b20c10fa28b00d4d1f2b18de3..b869caa5a82ef9271f709483bead98bb76396794 100644
--- a/src/Workspaces/Remote/ServiceHub/Services/CodeAnalysisService_Diagnostics.cs
+++ b/src/Workspaces/Remote/ServiceHub/Services/CodeAnalysisService_Diagnostics.cs
@@ -54,10 +54,8 @@ public Task CalculateDiagnosticsAsync(DiagnosticArguments arguments, string stre
             }, cancellationToken);
         }
 
-        private async Task<int> SerializeDiagnosticResultAsync(string streamName, DiagnosticAnalysisResultMap<string, DiagnosticAnalysisResultBuilder> result, CancellationToken cancellationToken)
+        private async Task SerializeDiagnosticResultAsync(string streamName, DiagnosticAnalysisResultMap<string, DiagnosticAnalysisResultBuilder> result, CancellationToken cancellationToken)
         {
-            var count = 0;
-
             using (RoslynLogger.LogBlock(FunctionId.CodeAnalysisService_SerializeDiagnosticResultAsync, GetResultLogInfo, result, cancellationToken))
             using (var stream = await DirectStream.GetAsync(streamName, cancellationToken).ConfigureAwait(false))
             {
@@ -72,8 +70,6 @@ private async Task<int> SerializeDiagnosticResultAsync(string streamName, Diagno
 
                 await stream.FlushAsync(cancellationToken).ConfigureAwait(false);
             }
-
-            return count;
         }
 
         private static string GetResultLogInfo(DiagnosticAnalysisResultMap<string, DiagnosticAnalysisResultBuilder> result)