diff --git a/Source/Client/Patches/TimestampFixer.cs b/Source/Client/Patches/TimestampFixer.cs
index dabea825..dedc99b0 100644
--- a/Source/Client/Patches/TimestampFixer.cs
+++ b/Source/Client/Patches/TimestampFixer.cs
@@ -52,8 +52,8 @@ public static void FixPawn(Pawn p, Map oldMap, Map newMap)
 
     public static void ProcessExposable(IExposable exposable)
     {
-        if (timestampFields.ContainsKey(exposable.GetType()))
-            foreach (var del in timestampFields[exposable.GetType()])
+        if (timestampFields.TryGetValue(exposable.GetType(), out var fieldGetters))
+            foreach (var del in fieldGetters)
                 del(exposable) += currentOffset!.Value;
     }
 }
diff --git a/Source/Client/UI/Layouter.cs b/Source/Client/UI/Layouter.cs
index 58213e92..a65664d5 100644
--- a/Source/Client/UI/Layouter.cs
+++ b/Source/Client/UI/Layouter.cs
@@ -131,9 +131,7 @@ public static bool BeginArea(int windowId, Rect rect, float spacing = 10f)
             PushGroup(new El { rect = rect.AtZero(), spacing = spacing });
 
             // Add to linked list
-            if (!firstTopLevel.ContainsKey(windowId))
-                firstTopLevel[windowId] = currentGroup;
-            else
+            if (!firstTopLevel.TryAdd(windowId, currentGroup))
                 currentTopLevel!.nextTopLevel = currentGroup;
 
             // Set current list pointer
diff --git a/Source/Client/Util/TypeCache.cs b/Source/Client/Util/TypeCache.cs
index 158442a8..3d7cf77b 100644
--- a/Source/Client/Util/TypeCache.cs
+++ b/Source/Client/Util/TypeCache.cs
@@ -36,11 +36,8 @@ internal static void CacheTypeByName()
     {
         foreach (var type in GenTypes.AllTypes)
         {
-            if (!typeByName.ContainsKey(type.Name))
-                typeByName[type.Name] = type;
-
-            if (!typeByFullName.ContainsKey(type.Name))
-                typeByFullName[type.FullName] = type;
+            typeByName.TryAdd(type.Name, type);
+            typeByFullName.TryAdd(type.FullName, type);
         }
     }