diff --git a/.efrocachemap b/.efrocachemap
index 424d5f0f..0fbba15c 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -3992,26 +3992,26 @@
   "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e",
   "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34",
   "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a",
-  "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/4c/b2/39ef64da4f7d8fc6d6596fb1e6dd",
-  "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/69/f1/997d1e46cf9980fb05feac2f65bb",
-  "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/78/bd/c4363c8c7c2d137d8c15cff3e5ce",
-  "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/69/54/8c36c9f32e980c4a3d6c80fda174",
-  "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/99/91/0d31e626b752c571f70ebc63e25b",
-  "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ff/f7/0facf2edf5ee9ab72c4e894b1447",
-  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/de/0f/1b3a4005489b88691bd230a74fde",
-  "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/49/de/1e62f4ef48ec29137da3280af2a4",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/94/21/e4643feb7b1a48104f843a5e7854",
-  "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/78/05/4e0de3d43eeca0b28003eda577e5",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e3/8c/c7db00bae865aa1b10d84759c0eb",
-  "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/67/a8/fc2e5f4bea3a80c260eed10b6271",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/fb/b5/93d7341a88da72392aca672345f2",
-  "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/33/f8/6a9b956c05c6cd1ddcd67a0eb2ef",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/bc/57/a08863dd0e2bbacd83bf5a51440b",
-  "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a1/93/aa05d62af22a8977f9c1b77d4fbe",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/57/d8/3b58524fbfb11dd5becd588dae21",
-  "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f6/42/2cd490281e940abfff7d96cbee53",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/7c/16/4a4f18656e5923e23cc5fb178be1",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/b5/ef/95c87dc189bbdf281934e8062394",
+  "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/bf/de/08804e3ad0f319521b1831dedb8b",
+  "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d6/8c/13132c50cc5613d8a1b63ae2b668",
+  "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/eb/9e/f7b96cb44899e45c8887e6b0a541",
+  "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/33/b5/94df2669c0972cb67f6d5a0deda2",
+  "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e5/50/55227dbd30219b2d85b91b3cb12e",
+  "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d6/0e/fe82f0f783da43ad915b8907f84d",
+  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/33/42/e0081d7e62f3d414330d48773064",
+  "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/71/39/33283a49ffd8ea1a1df1630e6960",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/3a/48/2a620297639e4cd77e7c47a31e6b",
+  "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/37/57/07794ce711c7c156bce78a51c485",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1d/bb/72d4eb6505c35d86371e3492963f",
+  "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2c/3e/c85c3d7d2834fc5d1e0abdc49fb9",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/4f/e7/da0f7ae7fb279bc8862b78c14e45",
+  "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ad/49/17db1cebd712f82af2639658e3f3",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2b/83/7ff2c4de06eb943e83ffdc8f17c6",
+  "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b4/d7/4d794ad4a56a1e46359d13c44123",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/ce/5c/df22430468506b5a2ed6172f326a",
+  "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/92/71/5301a16ba18e72504d10d0f72ce0",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/6e/e0/6bba7b32ead0a56ddace4c0f3515",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/b8/f9/282a87b6d4ed616c2e2d174f6ffb",
   "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/72/9d/7041244c1532e8739f4144a0dbdb",
   "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f9/d3/43568f3cfbf7b9e1f1c0a80d3cbb",
   "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1d/d7/9508dda5f67d8120159fc27e5aa6",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0899a113..7c29df8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 1.7.2 (20600, 2022-06-04)
+### 1.7.2 (20601, 2022-06-04)
 - Minor fixes in some minigames (Thanks Droopy!)
 - Fixed a bug preventing 'clients' arg from working in _ba.chatmessage (Thanks imayushsaini!)
 - Fixed a bug where ba.Player.getdelegate(doraise=True) could return None instead of raising a ba.DelegateNotFoundError (thanks Dliwk!)
diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc
index def93ec6..5df2752e 100644
--- a/src/ballistica/ballistica.cc
+++ b/src/ballistica/ballistica.cc
@@ -21,7 +21,7 @@
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kAppBuildNumber = 20600;
+const int kAppBuildNumber = 20601;
 const char* kAppVersion = "1.7.2";
 
 // Our standalone globals.
diff --git a/tools/efro/message/_protocol.py b/tools/efro/message/_protocol.py
index 526a9fa7..1d35db48 100644
--- a/tools/efro/message/_protocol.py
+++ b/tools/efro/message/_protocol.py
@@ -269,11 +269,7 @@ class MessageProtocol:
         ovld = ', overload' if not single_message_type else ''
         tpimport_lines = textwrap.indent(tpimport_lines, '    ')
 
-        # We need Optional for sender-modules with multiple types
-        # UPDATE: Not anymore with 3.10
         baseimps = ['Any']
-        # if part == 'sender' and len(msgtypes) > 1:
-        #     baseimps.append('Optional')
         if part == 'receiver':
             baseimps.append('Callable')
         baseimps_s = ', '.join(baseimps)
@@ -356,8 +352,6 @@ class MessageProtocol:
                     rtypes = msgtype.get_response_types()
                     if len(rtypes) > 1:
                         rtypevar = ' | '.join(_filt_tp_name(t) for t in rtypes)
-                        # tps = ', '.join(_filt_tp_name(t) for t in rtypes)
-                        # rtypevar = f'Union[{tps}]'
                     else:
                         rtypevar = _filt_tp_name(rtypes[0])
                     out += (f'\n'
@@ -377,8 +371,6 @@ class MessageProtocol:
                         if len(rtypes) > 1:
                             rtypevar = ' | '.join(
                                 _filt_tp_name(t) for t in rtypes)
-                            # tps = ', '.join(_filt_tp_name(t) for t in rtypes)
-                            # rtypevar = f'Union[{tps}]'
                         else:
                             rtypevar = _filt_tp_name(rtypes[0])
                         out += (f'\n'
@@ -448,8 +440,6 @@ class MessageProtocol:
                 rtypes = msgtype.get_response_types()
                 if len(rtypes) > 1:
                     rtypevar = ' | '.join(_filt_tp_name(t) for t in rtypes)
-                    # tps = ', '.join(_filt_tp_name(t) for t in rtypes)
-                    # rtypevar = f'Union[{tps}]'
                 else:
                     rtypevar = _filt_tp_name(rtypes[0])
                 rtypevar = f'{cbgn}{rtypevar}{cend}'
@@ -472,8 +462,6 @@ class MessageProtocol:
                     rtypes = msgtype.get_response_types()
                     if len(rtypes) > 1:
                         rtypevar = ' | '.join(_filt_tp_name(t) for t in rtypes)
-                        # tps = ', '.join(_filt_tp_name(t) for t in rtypes)
-                        # rtypevar = f'Union[{tps}]'
                     else:
                         rtypevar = _filt_tp_name(rtypes[0])
                     rtypevar = f'{cbgn}{rtypevar}{cend}'