diff --git a/src/Shared/HybridDictionary.cs b/src/Shared/HybridDictionary.cs
index 3b3a9bc797f..65ce6b02b16 100644
--- a/src/Shared/HybridDictionary.cs
+++ b/src/Shared/HybridDictionary.cs
@@ -674,7 +674,6 @@ private void AddToOrUpdateList(List<KeyValuePair<TKey, TValue>> list, TKey key,
                 }
 
                 list.Add(new KeyValuePair<TKey, TValue>(key, value));
-                return;
             }
             else
             {
@@ -694,7 +693,6 @@ private void AddToOrUpdateList(List<KeyValuePair<TKey, TValue>> list, TKey key,
                 }
 
                 _store = newDictionary;
-                return;
             }
         }
 
diff --git a/src/Shared/LogMessagePacketBase.cs b/src/Shared/LogMessagePacketBase.cs
index cec9d20c8f2..b7975542318 100644
--- a/src/Shared/LogMessagePacketBase.cs
+++ b/src/Shared/LogMessagePacketBase.cs
@@ -281,7 +281,7 @@ internal void WriteToStream(INodePacketTranslator translator)
                 // Make sure the other side knows what sort of serialization is coming
                 translator.Translate(ref packetVersion);
 
-                bool eventCanSerializeItself = (methodInfo != null) ? true : false;
+                bool eventCanSerializeItself = methodInfo != null;
                 translator.Translate(ref eventCanSerializeItself);
 
                 if (eventCanSerializeItself)
diff --git a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs
index 383f01c8650..826991d24a7 100644
--- a/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs
+++ b/src/XMakeBuildEngine/BackEnd/BuildManager/BuildParameters.cs
@@ -1057,7 +1057,6 @@ private void FindMSBuildExe()
             }
 
             // Well, we just can't find it.  Maybe they will only build in-proc and won't need it...
-            return;
         }
 
         /// <summary>
diff --git a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs
index 0000db0cfc7..4950f0f9def 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/Communications/NodeProviderOutOfProcTaskHost.cs
@@ -570,7 +570,7 @@ internal bool CreateNode(TaskHostContext hostContext, INodePacketFactory factory
                 return false;
             }
 
-            CommunicationsUtilities.Trace("For a host context of {0}, spawning executable from {1}.", hostContext.ToString(), msbuildLocation ?? "MSBuild.exe");
+            CommunicationsUtilities.Trace("For a host context of {0}, spawning executable from {1}.", hostContext.ToString(), msbuildLocation);
 
             // Make it here.
             NodeContext context = GetNode
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs
index f8ce22652c2..e55fd6522b9 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/Lookup.cs
@@ -1085,7 +1085,7 @@ public MetadataModifications Clone()
             /// </summary>
             public bool HasChanges
             {
-                get { return _modifications.Count > 0 || _keepOnlySpecified == true; }
+                get { return _modifications.Count > 0 || _keepOnlySpecified; }
             }
 
             /// <summary>
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs
index b1514a05244..b94de3c53dd 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetBuilder.cs
@@ -520,8 +520,6 @@ private async Task ProcessTargetStack(ITaskBuilder taskBuilder)
                         break;
                 }
             }
-
-            return;
         }
 
         /// <summary>
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs
index 2a8a4a26329..317b8f56d2f 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs
@@ -662,7 +662,6 @@ internal async Task ExecuteTarget(ITaskBuilder taskBuilder, BuildRequestEntry re
                 DataCollection.CommentMarkProfile(8801, endTargetBuild);
             }
 #endif
-            return;
         }
 
         /// <summary>
diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs
index 389565e5d0e..23c5ea8871d 100644
--- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs
+++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TaskBuilder.cs
@@ -314,7 +314,7 @@ private async Task<WorkUnitResult> ExecuteTask(TaskExecutionMode mode, Lookup lo
                 // Only create a hash table if there are more than one bucket as this is the only time a property can be overridden
                 if (buckets.Count > 1)
                 {
-                    lookupHash = lookupHash ?? new Dictionary<string, string>(MSBuildNameIgnoreCaseComparer.Default);
+                    lookupHash = new Dictionary<string, string>(MSBuildNameIgnoreCaseComparer.Default);
                 }
 
                 WorkUnitResult aggregateResult = new WorkUnitResult();
diff --git a/src/XMakeCommandLine/OutOfProcTaskHostNode.cs b/src/XMakeCommandLine/OutOfProcTaskHostNode.cs
index ee892862ada..9222f44f896 100644
--- a/src/XMakeCommandLine/OutOfProcTaskHostNode.cs
+++ b/src/XMakeCommandLine/OutOfProcTaskHostNode.cs
@@ -728,9 +728,6 @@ private void OnLinkStatusChanged(INodeEndpoint endpoint, LinkStatus status)
 
                 case LinkStatus.Inactive:
                     break;
-
-                default:
-                    break;
             }
         }
 
@@ -893,7 +890,7 @@ private void SetTaskHostEnvironment(IDictionary<string, string> environment)
                         {
                             if (_updateEnvironmentAndLog)
                             {
-                                LogMessageFromResource(MessageImportance.Low, "ModifyingTaskHostEnvironmentVariable", variable, newValue ?? String.Empty, environmentValue ?? String.Empty);
+                                LogMessageFromResource(MessageImportance.Low, "ModifyingTaskHostEnvironmentVariable", variable, newValue, environmentValue ?? String.Empty);
                             }
 
                             updatedEnvironment[variable] = newValue;