diff --git a/.bazelrc b/.bazelrc
index 401d6260..10ebbfaf 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -374,6 +374,10 @@ build:c-as-cpp --per_file_copt='//c-toxcore[:/]@-Wno-old-style-cast'
 build:c-as-cpp --per_file_copt='//c-toxcore[:/]@-Wno-unreachable-code-return'
 build:c-as-cpp --per_file_copt='//c-toxcore[:/]@-Wno-unused-macros'
 
+# Use _Nullable and _Nonnull on toxcore.
+build --per_file_copt='//c-toxcore[:/]@-Wno-nullability-extension'
+build --per_file_copt='//c-toxcore[:/]@-Wno-nullable-to-nonnull-conversion'
+
 # Cyclone.
 build --host_per_file_copt='//cyclone[:/]@-w'
 build --per_file_copt='//cyclone/stage0[:/]@-w'
diff --git a/.restyled.yaml b/.restyled.yaml
index c4b99bc9..10b67c03 100644
--- a/.restyled.yaml
+++ b/.restyled.yaml
@@ -11,3 +11,8 @@ exclude:
   - "third_party/libzmq/**/*.hpp"
   - "third_party/ncurses/src/**/*"
   - "third_party/opus/**/*.h"
+
+restylers:
+  - pyment:
+      enabled: false
+  - "*"
diff --git a/WORKSPACE b/WORKSPACE
index d48f5f44..61ad5c7d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -491,7 +491,10 @@ http_archive(
     build_file = "@toktok//third_party:ncurses.BUILD",
     integrity = "sha256-E22RvCaamleF5fnpgLx2q1dCj2BM4+WlqQzrx2eXHMY=",
     strip_prefix = "ncurses-6.5",
-    urls = ["https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.5.tar.gz"],
+    urls = [
+        "https://invisible-island.net/archives/ncurses/ncurses-6.5.tar.gz",
+        "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.5.tar.gz",
+    ],
 )
 
 http_archive(
diff --git a/c-toxcore b/c-toxcore
index f81e3067..14804a4b 160000
--- a/c-toxcore
+++ b/c-toxcore
@@ -1 +1 @@
-Subproject commit f81e30679b1ceed00c15e97835dbd9f4f684bcee
+Subproject commit 14804a4b86413b97d00c59f12df15ec7af53891b
diff --git a/cspell.config.yaml b/cspell.config.yaml
index c93738f2..06121524 100644
--- a/cspell.config.yaml
+++ b/cspell.config.yaml
@@ -14,6 +14,7 @@ words:
   - buildx
   - ccache
   - choco
+  - cimple
   - citri
   - codesign
   - createdmg
@@ -54,6 +55,7 @@ words:
   - srcs
   - startswith
   - teehee
+  - tokstyle
   - toktok
   - toplevel
   - toxchat
diff --git a/hs-cimple b/hs-cimple
index cb005324..fd5535a0 160000
--- a/hs-cimple
+++ b/hs-cimple
@@ -1 +1 @@
-Subproject commit cb00532404536f741b88868e15fdf0c97c6263b1
+Subproject commit fd5535a0a08a2ebcb9c6bde6722609256cfda359
diff --git a/hs-tokstyle b/hs-tokstyle
index f5742a39..261e8081 160000
--- a/hs-tokstyle
+++ b/hs-tokstyle
@@ -1 +1 @@
-Subproject commit f5742a39c531eac2aaf25f48685f3768ab9cdb63
+Subproject commit 261e808192afd9756d477cda0221664eecfe18b6
diff --git a/tools/project/cabal_test b/tools/project/cabal_test
index 28ae9c54..3c2b28fd 100755
--- a/tools/project/cabal_test
+++ b/tools/project/cabal_test
@@ -24,18 +24,19 @@ def parse_bazel(build: str) -> PackageData:
                 and stmt.value.func.id in ("haskell_library", "hspec_test")):
             section: Dict[str, Union[str, List[str]]] = {}
             for arg in stmt.value.keywords:
-                if arg.arg == "name" and isinstance(arg.value, ast.Str):
-                    data[arg.value.s] = section
-                if arg.arg == "version" and isinstance(arg.value, ast.Str):
-                    section["version"] = arg.value.s
+                if arg.arg == "name" and isinstance(arg.value, ast.Constant):
+                    data[arg.value.value] = section
+                if arg.arg == "version" and isinstance(arg.value,
+                                                       ast.Constant):
+                    section["version"] = arg.value.value
                 if arg.arg == "deps" and isinstance(arg.value, ast.List):
                     deps = []
                     for dep in arg.value.elts:
                         if isinstance(dep, ast.Call) and isinstance(
-                                dep.args[0], ast.Str):
-                            deps.append(dep.args[0].s)
-                        elif isinstance(dep, ast.Str):
-                            deps.append(dep.s)
+                                dep.args[0], ast.Constant):
+                            deps.append(dep.args[0].value)
+                        elif isinstance(dep, ast.Constant):
+                            deps.append(dep.value)
                         else:
                             raise Exception(ast.dump(dep))
                     section["deps"] = deps
@@ -44,8 +45,8 @@ def parse_bazel(build: str) -> PackageData:
 
 
 def parse_cabal(cabal: str) -> Dict[str, PackageData]:
-    data: Dict[str, PackageData] = (
-        collections.defaultdict(lambda: collections.defaultdict(dict)))
+    data: Dict[str, PackageData] = collections.defaultdict(
+        lambda: collections.defaultdict(dict))
     section = data[""][""]
     key = ""
     value = ""
@@ -78,10 +79,11 @@ def parse_cabal(cabal: str) -> Dict[str, PackageData]:
 
 
 def resolve_bazel_deps(
-        bazel: str,
-        data: PackageData,
-        name: str,
+    bazel: str,
+    data: PackageData,
+    name: str,
 ) -> Set[str]:
+
     def go(name: str) -> List[str]:
         deps = []
         rule = data.get(name, None)
@@ -122,11 +124,11 @@ def must_str(maybe_list: Union[str, List[str]]) -> str:
 
 
 def check_deps(
-        bazel: str,
-        cabal: str,
-        bazel_data: PackageData,
-        bazel_name: str,
-        cabal_section: PackageSection,
+    bazel: str,
+    cabal: str,
+    bazel_data: PackageData,
+    bazel_name: str,
+    cabal_section: PackageSection,
 ) -> None:
     bazel_deps = resolve_bazel_deps(bazel, bazel_data, bazel_name)
     cabal_deps = {
@@ -163,9 +165,9 @@ def check_deps(
 
 
 def check_version(
-        root: PackageSection,
-        bazel_data: PackageData,
-        package_name: str,
+    root: PackageSection,
+    bazel_data: PackageData,
+    package_name: str,
 ) -> None:
     cabal_version = root["version"]
     bazel_version = bazel_data["hs-" + package_name]["version"]