From b1321ab40fdd13b8ffe18810e512f58948b27137 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 13 Apr 2026 23:57:58 +0000
Subject: [PATCH 1/3] Fix typesafety test expectations for mypy 1.18 changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update 'Cannot infer type argument N' → 'Cannot infer value of type parameter X'
- Remove no longer emitted '"Never" not callable' error
- Remove no longer emitted 'erased type of self' errors

Agent-Logs-Url: https://github.com/dry-python/returns/sessions/f332ee3a-c556-47ec-a276-8119a6a98aca

Co-authored-by: sobolevn <4660275+sobolevn@users.noreply.github.com>
---
 typesafety/test_converters/test_flatten.yml                   | 2 +-
 typesafety/test_functions/test_compose.yml                    | 2 +-
 typesafety/test_pipeline/test_managed/test_managed_errors.yml | 2 +-
 typesafety/test_pipeline/test_pipe/test_pipe_errors.yml       | 1 -
 .../test_hkt/test_kinded/test_kinded_methods.yml              | 4 ----
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/typesafety/test_converters/test_flatten.yml b/typesafety/test_converters/test_flatten.yml
index b9f572ce1..02e9c131f 100644
--- a/typesafety/test_converters/test_flatten.yml
+++ b/typesafety/test_converters/test_flatten.yml
@@ -25,7 +25,7 @@
     from returns.result import Result
 
     x: Result[Result[int, str], float]
-    flatten(x)  # E: Cannot infer type argument 3 of "flatten"  [misc]
+    flatten(x)  # E: Cannot infer value of type parameter "_SecondType" of "flatten"  [misc]
 
 
 - case: flatten_custom_type
diff --git a/typesafety/test_functions/test_compose.yml b/typesafety/test_functions/test_compose.yml
index 8e9307092..57b48d5c5 100644
--- a/typesafety/test_functions/test_compose.yml
+++ b/typesafety/test_functions/test_compose.yml
@@ -24,7 +24,7 @@
 
     reveal_type(compose(first, second))
   out: |
-    main:9: error: Cannot infer type argument 2 of "compose"  [misc]
+    main:9: error: Cannot infer value of type parameter "_SecondType" of "compose"  [misc]
     main:9: note: Revealed type is "def (Any) -> Any"
 
 
diff --git a/typesafety/test_pipeline/test_managed/test_managed_errors.yml b/typesafety/test_pipeline/test_managed/test_managed_errors.yml
index 3ad90f357..a302e99a8 100644
--- a/typesafety/test_pipeline/test_managed/test_managed_errors.yml
+++ b/typesafety/test_pipeline/test_managed/test_managed_errors.yml
@@ -35,7 +35,7 @@
         ...
 
     x: IOResult[int, str]
-    managed(use, release)(x)  # E: Cannot infer type argument 3 of "managed"  [misc]
+    managed(use, release)(x)  # E: Cannot infer value of type parameter "_UpdatedType" of "managed"  [misc]
 
 
 - case: managed_with_wrong_container_input
diff --git a/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml b/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml
index 29daad4ae..00c006137 100644
--- a/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml
+++ b/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml
@@ -20,7 +20,6 @@
     pipe([], int)('a')
   out: |
     main:3: error: "list[Never]" not callable  [operator]
-    main:3: error: "Never" not callable  [misc]
     main:3: error: Argument 1 to "__call__" of "_Pipe" has incompatible type "str"; expected "Never"  [arg-type]
 
 
diff --git a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml
index b57b96caf..38c8f08cc 100644
--- a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml
+++ b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml
@@ -145,8 +145,6 @@
             function: Callable[[_FirstType], _UpdatedType],
         ) -> Kind1[_MappableType, _UpdatedType]:
             ...
-  out: |
-    main:10: error: The erased type of self "builtins.int" is not a supertype of its class "main.Mappable"  [misc]
 
 
 - case: kinded_with_wrong_self_type2
@@ -168,5 +166,3 @@
             function: Callable[[_FirstType], _UpdatedType],
         ) -> Kind1[_MappableType, _UpdatedType]:
             ...
-  out: |
-    main:11: error: The erased type of self "type[builtins.int]" is not a supertype of its class "type[main.Mappable]"  [misc]

From 1f121a8191fa7577fb73b25d5a0b2ec47f2a5654 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 14 Apr 2026 00:14:04 +0000
Subject: [PATCH 2/3] Update mypy support to 1.20.1 and fix all typesafety test
 expectations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Update mypy version constraint from >=1.12,<1.18 to >=1.12,<1.21
- Fix builtins.X → X display changes in all typesafety YAML tests (mypy 1.20)
- Fix TypeVar backtick suffix removal in revealed types (mypy 1.20)
- Fix 'Cannot infer type argument N' → 'Cannot infer value of type parameter X' (mypy 1.18)
- Remove no longer emitted 'Never not callable' and 'erased type of self' errors (mypy 1.18)
- Remove no longer emitted 'defined here' note (mypy 1.20)
- Remove unused type: ignore comment in test_pickle.py (mypy 1.20 improvement)

Agent-Logs-Url: https://github.com/dry-python/returns/sessions/f332ee3a-c556-47ec-a276-8119a6a98aca

Co-authored-by: sobolevn <4660275+sobolevn@users.noreply.github.com>
---
 pyproject.toml                                |  2 +-
 .../test_base_container/test_pickle.py        |  2 +-
 .../test_requires_context/test_context.yml    |  6 +--
 .../test_requires_context_cast.yml            |  6 +--
 .../test_requires_context_type.yml            | 12 ++---
 .../test_requires_context_typecast.yml        |  6 +--
 .../test_context_future_result.yml            |  2 +-
 .../test_requires_context_future_result.yml   | 40 +++++++--------
 ...st_requires_context_future_result_cast.yml |  6 +--
 ...st_requires_context_future_result_unit.yml | 28 +++++------
 .../test_context_ioresult.yml                 |  2 +-
 .../test_requires_context_ioresult.yml        | 26 +++++-----
 .../test_requires_context_ioresult_cast.yml   |  6 +--
 .../test_requires_context_ioresult_unit.yml   | 20 ++++----
 .../test_context_result.yml                   |  2 +-
 .../test_requires_context_cast.yml            |  6 +--
 .../test_requires_context_result.yml          | 20 ++++----
 .../test_requires_context_result_unit.yml     | 12 ++---
 typesafety/test_converters/test_flatten.yml   | 22 ++++----
 .../test_converters/test_maybe_to_result.yml  |  4 +-
 .../test_converters/test_result_to_maybe.yml  |  2 +-
 .../test_curry/test_curry/test_curry.yml      | 46 ++++++++---------
 .../test_curry/test_curry_arguments.yml       | 38 +++++++-------
 .../test_curry/test_curry_generics.yml        | 28 +++++------
 .../test_curry/test_partial/test_partial.yml  | 15 +++---
 .../test_partial/test_partial_arguments.yml   | 50 +++++++++----------
 .../test_partial/test_partial_generic.yml     | 38 +++++++-------
 .../test_partial/test_partial_overload.yml    | 40 +++++++--------
 .../test_your_container/test_pair4_def.yml    |  4 +-
 .../test_your_container/test_pair4_reuse.yml  |  4 +-
 typesafety/test_functions/test_compose.yml    |  4 +-
 typesafety/test_functions/test_identity.yml   |  2 +-
 typesafety/test_functions/test_not_.yml       |  4 +-
 typesafety/test_functions/test_tap.yml        |  4 +-
 .../test_asyncify_decorator.yml               |  2 +-
 .../test_future_container/test_do.yml         |  2 +-
 .../test_future_base.yml                      | 18 +++----
 .../test_future_decorator.yml                 |  4 +-
 .../test_future_typecast.yml                  |  8 +--
 .../test_future_result_container/test_do.yml  | 10 ++--
 .../test_future_result_base.yml               | 32 ++++++------
 .../test_future_result_typecast.yml           | 34 ++++++-------
 .../test_future_safe_decorator.yml            |  8 +--
 .../test_altable/test_inheritance.yml         |  4 +-
 .../test_bindable/test_inheritance.yml        |  6 +--
 .../test_equality/test_inheritance.yml        |  8 +--
 .../test_failable/test_diverse_failable.yml   |  4 +-
 .../test_lashable/test_inheritance.yml        |  4 +-
 .../test_mappable/test_inheritance.yml        |  6 +--
 .../test_futurebased_inheritance.yml          |  4 +-
 .../test_futurelike_inheritance.yml           |  4 +-
 .../test_future_result_based.yml              |  2 +-
 .../test_future_result_like.yml               |  2 +-
 .../test_specific/test_io/test_io_like.yml    |  2 +-
 .../test_ioresultbased_inheritance.yml        |  4 +-
 .../test_ioresultlike_inheritance.yml         |  4 +-
 .../test_reader/test_reader_based2.yml        |  2 +-
 .../test_reader/test_reader_like2.yml         |  2 +-
 .../test_reader/test_reader_like3.yml         |  2 +-
 .../test_resultbased_inheritance.yml          |  4 +-
 .../test_resultlike_inheritance.yml           |  4 +-
 .../test_unwrappable/test_inheritance.yml     |  4 +-
 .../test_io/test_io_container/test_do.yml     |  2 +-
 .../test_io/test_io_container/test_impure.yml | 12 ++---
 .../test_io_container/test_io_base.yml        | 14 +++---
 .../test_io_container/test_io_type_cast.yml   |  4 +-
 .../test_construct_iofailure.yml              |  6 +--
 .../test_construct_iosucess.yml               | 14 +++---
 .../test_ioresult_container/test_do.yml       | 14 +++---
 .../test_impure_safe.yml                      |  6 +--
 .../test_ioresult_helpers.yml                 |  6 +--
 .../test_ioresult_typecast.yml                | 24 ++++-----
 .../test_fold/test_fold_collect.yml           | 36 ++++++-------
 .../test_fold/test_fold_collect_all.yml       | 30 +++++------
 .../test_fold/test_fold_loop.yml              | 36 ++++++-------
 typesafety/test_maybe/test_do.yml             |  4 +-
 .../test_maybe/test_maybe_decorator.yml       | 18 +++----
 typesafety/test_maybe/test_maybe_type.yml     | 32 ++++++------
 .../test_maybe/test_maybe_type_cast.yml       |  4 +-
 typesafety/test_methods/test_cond.yml         | 16 +++---
 typesafety/test_methods/test_partition.yml    |  6 +--
 .../test_methods/test_unwrap_or_failure.yml   |  6 +--
 .../test_flow/test_flow_args.yml              |  2 +-
 .../test_flow/test_flow_base.yml              | 20 ++++----
 .../test_flow/test_flow_curry.yml             |  4 +-
 .../test_flow/test_flow_errors.yml            | 10 ++--
 .../test_flow/test_flow_generics.yml          |  4 +-
 .../test_pipeline/test_is_successful.yml      | 12 ++---
 .../test_managed/test_managed_types.yml       | 10 ++--
 .../test_pipe/test_pipe_base.yml              | 20 ++++----
 .../test_pipe/test_pipe_callable_protocol.yml |  6 +--
 .../test_pipe/test_pipe_curry.yml             |  2 +-
 .../test_pipe/test_pipe_errors.yml            |  8 +--
 .../test_pipe/test_pipe_generic.yml           |  4 +-
 typesafety/test_pointfree/test_alt.yml        | 16 +++---
 typesafety/test_pointfree/test_apply.yml      | 24 ++++-----
 typesafety/test_pointfree/test_bimap.yml      | 16 +++---
 typesafety/test_pointfree/test_bind.yml       | 24 ++++-----
 typesafety/test_pointfree/test_bind_async.yml | 10 ++--
 .../test_bind_async_context_future_result.yml |  2 +-
 .../test_pointfree/test_bind_async_future.yml | 10 ++--
 .../test_bind_async_future_result.yml         |  6 +--
 .../test_pointfree/test_bind_awaitable.yml    | 10 ++--
 .../test_pointfree/test_bind_context2.yml     |  6 +--
 .../test_pointfree/test_bind_context3.yml     | 12 ++---
 .../test_bind_context_future_result.yml       |  2 +-
 .../test_bind_context_ioresult.yml            |  4 +-
 .../test_bind_context_result.yml              |  6 +--
 .../test_pointfree/test_bind_future.yml       | 10 ++--
 .../test_bind_future_result.yml               |  6 +--
 typesafety/test_pointfree/test_bind_io.yml    | 16 +++---
 .../test_pointfree/test_bind_ioresult.yml     | 12 ++---
 .../test_pointfree/test_bind_optional.yml     |  2 +-
 .../test_pointfree/test_bind_result.yml       | 16 +++---
 .../test_pointfree/test_compose_result.yml    | 10 ++--
 typesafety/test_pointfree/test_cond.yml       | 14 +++---
 typesafety/test_pointfree/test_map.yml        | 28 +++++------
 .../test_pointfree/test_modify_env2.yml       |  6 +--
 .../test_pointfree/test_modify_env3.yml       | 12 ++---
 typesafety/test_pointfree/test_rescue.yml     | 16 +++---
 typesafety/test_pointfree/test_unify.yml      | 14 +++---
 .../test_hkt/test_dekind/test_dekind.yml      |  8 +--
 .../test_hkt/test_kinded/test_kinded.yml      | 14 +++---
 .../test_kinded/test_kinded_methods.yml       | 16 +++---
 .../test_kinded/test_kinded_nested.yml        | 12 ++---
 .../test_kinded/test_kinded_overload.yml      |  2 +-
 .../test_kindn/test_kindn_getattr.yml         |  2 +-
 .../test_hkt/test_supports_kind.yml           |  2 +-
 .../test_reawaitable_decorator.yml            |  2 +-
 .../test_tracing/test_collect_traces.yml      |  8 +--
 typesafety/test_result/test_attempt.yml       |  4 +-
 .../test_result/test_construct_failure.yml    |  6 +--
 .../test_result/test_construct_success.yml    | 14 +++---
 typesafety/test_result/test_do.yml            |  8 +--
 typesafety/test_result/test_result_error.yml  |  2 +-
 .../test_result/test_result_type_cast.yml     | 28 +++++------
 typesafety/test_result/test_safe.yml          | 38 +++++++-------
 .../test_trampolines/test_trampoline.yml      |  2 +-
 typesafety/test_unsafe/test_unsafe.yml        |  2 +-
 139 files changed, 785 insertions(+), 786 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 09e43f9e4..679919e23 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ dependencies.python = "^3.10"
 dependencies.typing-extensions = ">=4.0,<5.0"
 dependencies.pytest = { version = ">=8,<10", optional = true }
 dependencies.hypothesis = { version = "^6.151", optional = true }
-dependencies.mypy = { version = ">=1.12,<1.18", optional = true }
+dependencies.mypy = { version = ">=1.12,<1.21", optional = true }
 extras.compatible-mypy = [ "mypy" ]
 extras.check-laws = [ "pytest", "hypothesis" ]
 group.dev.dependencies.anyio = "^4.3"
diff --git a/tests/test_primitives/test_container/test_base_container/test_pickle.py b/tests/test_primitives/test_container/test_base_container/test_pickle.py
index f657c2b45..453ae4304 100644
--- a/tests/test_primitives/test_container/test_base_container/test_pickle.py
+++ b/tests/test_primitives/test_container/test_base_container/test_pickle.py
@@ -14,7 +14,7 @@ def __init__(self, inner_value: Any) -> None:
     def __eq__(self, other: object) -> bool:
         return (
             type(other) is type(self)  # noqa: WPS516
-            and self.inner_value == other.inner_value  # type: ignore[attr-defined]
+            and self.inner_value == other.inner_value
         )
 
     def __hash__(self) -> int:
diff --git a/typesafety/test_context/test_requires_context/test_context.yml b/typesafety/test_context/test_requires_context/test_context.yml
index f2a3a592f..d6de1c029 100644
--- a/typesafety/test_context/test_requires_context/test_context.yml
+++ b/typesafety/test_context/test_requires_context/test_context.yml
@@ -11,7 +11,7 @@
   main: |
     from returns.context import RequiresContext
 
-    reveal_type(RequiresContext[int, str].ask())  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.str, builtins.str]"
+    reveal_type(RequiresContext[int, str].ask())  # N: Revealed type is "returns.context.requires_context.RequiresContext[str, str]"
 
 
 - case: requires_context_from_value
@@ -19,7 +19,7 @@
   main: |
     from returns.context import RequiresContext
 
-    reveal_type(RequiresContext.from_value(1))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, Any]"
+    reveal_type(RequiresContext.from_value(1))  # N: Revealed type is "returns.context.requires_context.RequiresContext[int, Any]"
 
 
 - case: requires_context_from_context
@@ -28,4 +28,4 @@
     from returns.context import RequiresContext
 
     x: RequiresContext[int, str]
-    reveal_type(RequiresContext.from_context(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, builtins.str]"
+    reveal_type(RequiresContext.from_context(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[int, str]"
diff --git a/typesafety/test_context/test_requires_context/test_requires_context_cast.yml b/typesafety/test_context/test_requires_context/test_requires_context_cast.yml
index 8555be989..da3540499 100644
--- a/typesafety/test_context/test_requires_context/test_requires_context_cast.yml
+++ b/typesafety/test_context/test_requires_context/test_requires_context_cast.yml
@@ -6,7 +6,7 @@
     first: RequiresContext[TypeError, int]  # we can only cast return type
     second: RequiresContext[Exception, int] = first
 
-    reveal_type(second)  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.Exception, builtins.int]"
+    reveal_type(second)  # N: Revealed type is "returns.context.requires_context.RequiresContext[Exception, int]"
 
 
 - case: context_wrong_cast
@@ -46,7 +46,7 @@
     reveal_type(func().bind(second))
     reveal_type(func().bind(third))
   out: |
-    main:21: note: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, main.B]"
+    main:21: note: Revealed type is "returns.context.requires_context.RequiresContext[int, main.B]"
     main:21: error: Argument 1 to "bind" of "RequiresContext" has incompatible type "Callable[[int], RequiresContext[int, A]]"; expected "Callable[[int], KindN[RequiresContext[Any, Any], int, B, Any]]"  [arg-type]
-    main:22: note: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, main.B]"
+    main:22: note: Revealed type is "returns.context.requires_context.RequiresContext[int, main.B]"
     main:22: error: Argument 1 to "bind" of "RequiresContext" has incompatible type "Callable[[int], RequiresContext[int, C]]"; expected "Callable[[int], KindN[RequiresContext[Any, Any], int, B, Any]]"  [arg-type]
diff --git a/typesafety/test_context/test_requires_context/test_requires_context_type.yml b/typesafety/test_context/test_requires_context/test_requires_context_type.yml
index 9359700c6..c19c0f842 100644
--- a/typesafety/test_context/test_requires_context/test_requires_context_type.yml
+++ b/typesafety/test_context/test_requires_context/test_requires_context_type.yml
@@ -5,7 +5,7 @@
 
     first: RequiresContext[str, int]
 
-    reveal_type(first(1))  # N: Revealed type is "builtins.str"
+    reveal_type(first(1))  # N: Revealed type is "str"
 
 
 - case: requires_context_getattr
@@ -24,7 +24,7 @@
 
     first: RequiresContext[str, int]
 
-    reveal_type(first.map(lambda char: float(char)))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.float, builtins.int]"
+    reveal_type(first.map(lambda char: float(char)))  # N: Revealed type is "returns.context.requires_context.RequiresContext[float, int]"
 
 
 - case: requires_context_apply_correct
@@ -36,7 +36,7 @@
     first: RequiresContext[str, int]
     second: RequiresContext[Callable[[str], float], int]
 
-    reveal_type(first.apply(second))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.float, builtins.int]"
+    reveal_type(first.apply(second))  # N: Revealed type is "returns.context.requires_context.RequiresContext[float, int]"
 
 
 - case: requires_context_bind_correct
@@ -49,7 +49,7 @@
     def function(arg: str) -> RequiresContext[float, int]:
         return RequiresContext.from_value(1.5)
 
-    reveal_type(first.bind(function))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.float, builtins.int]"
+    reveal_type(first.bind(function))  # N: Revealed type is "returns.context.requires_context.RequiresContext[float, int]"
 
 
 - case: requires_context_bind_context_correct
@@ -62,7 +62,7 @@
     def function(arg: str) -> RequiresContext[float, int]:
         return RequiresContext.from_value(1.5)
 
-    reveal_type(first.bind_context(function))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.float, builtins.int]"
+    reveal_type(first.bind_context(function))  # N: Revealed type is "returns.context.requires_context.RequiresContext[float, int]"
 
 
 - case: requires_context_modify_env
@@ -71,7 +71,7 @@
     from returns.context import RequiresContext
 
     first: RequiresContext[float, int]
-    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "builtins.float"
+    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "float"
 
 
 - case: requires_context_call_wrong
diff --git a/typesafety/test_context/test_requires_context/test_requires_context_typecast.yml b/typesafety/test_context/test_requires_context/test_requires_context_typecast.yml
index bb8a418cc..f80e2b355 100644
--- a/typesafety/test_context/test_requires_context/test_requires_context_typecast.yml
+++ b/typesafety/test_context/test_requires_context/test_requires_context_typecast.yml
@@ -6,7 +6,7 @@
 
     x: RequiresContextIOResult[int, float, str]
 
-    reveal_type(RequiresContext.from_requires_context_ioresult(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[returns.io.IOResult[builtins.int, builtins.float], builtins.str]"
+    reveal_type(RequiresContext.from_requires_context_ioresult(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[returns.io.IOResult[int, float], str]"
 
 
 - case: requires_context_from_requires_context_result
@@ -17,7 +17,7 @@
 
     x: RequiresContextResult[int, float, str]
 
-    reveal_type(RequiresContext.from_requires_context_result(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[returns.result.Result[builtins.int, builtins.float], builtins.str]"
+    reveal_type(RequiresContext.from_requires_context_result(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[returns.result.Result[int, float], str]"
 
 
 - case: requires_context_from_requires_context_future_result
@@ -28,4 +28,4 @@
 
     x: RequiresContextFutureResult[int, float, str]
 
-    reveal_type(RequiresContext.from_requires_context_future_result(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[returns.future.FutureResult[builtins.int, builtins.float], builtins.str]"
+    reveal_type(RequiresContext.from_requires_context_future_result(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[returns.future.FutureResult[int, float], str]"
diff --git a/typesafety/test_context/test_requires_context_future_result/test_context_future_result.yml b/typesafety/test_context/test_requires_context_future_result/test_context_future_result.yml
index 48dbc7eef..4afbe8f56 100644
--- a/typesafety/test_context/test_requires_context_future_result/test_context_future_result.yml
+++ b/typesafety/test_context/test_requires_context_future_result/test_context_future_result.yml
@@ -11,4 +11,4 @@
   main: |
     from returns.context import RequiresContextFutureResult
 
-    reveal_type(RequiresContextFutureResult[int, bool, str].ask())  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.str, builtins.bool, builtins.str]"
+    reveal_type(RequiresContextFutureResult[int, bool, str].ask())  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[str, bool, str]"
diff --git a/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result.yml b/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result.yml
index 66c5ee9cd..6ae070d55 100644
--- a/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result.yml
+++ b/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result.yml
@@ -5,7 +5,7 @@
 
     x: RequiresContextFutureResult[int, float, str]
 
-    reveal_type(x('a'))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.float]"
+    reveal_type(x('a'))  # N: Revealed type is "returns.future.FutureResult[int, float]"
 
 
 - case: requires_context_future_result_getattr
@@ -24,7 +24,7 @@
 
     x: RequiresContextFutureResult[int, float, str]
 
-    reveal_type(x.swap())  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.float, builtins.int, builtins.str]"
+    reveal_type(x.swap())  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[float, int, str]"
 
 
 - case: requires_context_future_result_map
@@ -34,7 +34,7 @@
 
     x: RequiresContextFutureResult[int, float, str]
 
-    reveal_type(x.map(bool))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.map(bool))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_apply
@@ -46,7 +46,7 @@
     x: RequiresContextFutureResult[int, float, str]
     y: RequiresContextFutureResult[Callable[[int], bool], float, str]
 
-    reveal_type(x.apply(y))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.apply(y))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind
@@ -59,7 +59,7 @@
     def test(param: int) -> RequiresContextFutureResult[bool, float, str]:
         ...
 
-    reveal_type(x.bind(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_awaitable
@@ -72,7 +72,7 @@
 
     first: RequiresContextFutureResult[int, str, bool]
 
-    reveal_type(first.bind_awaitable(bind_awaitable))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.float, builtins.str, builtins.bool]"
+    reveal_type(first.bind_awaitable(bind_awaitable))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[float, str, bool]"
 
 
 - case: requires_context_future_result_bind_async
@@ -85,7 +85,7 @@
 
     first: RequiresContextFutureResult[int, str, bool]
 
-    reveal_type(first.bind_async(bind_async))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.float, builtins.str, builtins.bool]"
+    reveal_type(first.bind_async(bind_async))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[float, str, bool]"
 
 
 - case: requires_context_future_result_bind_result
@@ -99,7 +99,7 @@
     def test(param: int) -> Result[bool, float]:
         ...
 
-    reveal_type(x.bind_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_ioresult
@@ -113,7 +113,7 @@
     def test(param: int) -> IOResult[bool, float]:
         ...
 
-    reveal_type(x.bind_ioresult(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_ioresult(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_io
@@ -127,7 +127,7 @@
     def test(param: int) -> IO[bool]:
         ...
 
-    reveal_type(x.bind_io(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_io(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_future
@@ -141,7 +141,7 @@
     def test(param: int) -> Future[bool]:
         ...
 
-    reveal_type(x.bind_future(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_future(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_future_result
@@ -155,7 +155,7 @@
     def test(param: int) -> FutureResult[bool, float]:
         ...
 
-    reveal_type(x.bind_future_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_future_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_async_future
@@ -169,7 +169,7 @@
     async def test(param: int) -> Future[bool]:
         ...
 
-    reveal_type(x.bind_async_future(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_async_future(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_async_future_result
@@ -183,7 +183,7 @@
     async def test(param: int) -> FutureResult[bool, float]:
         ...
 
-    reveal_type(x.bind_async_future_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_async_future_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_context
@@ -196,7 +196,7 @@
     def test(param: int) -> RequiresContext[bool, str]:
         ...
 
-    reveal_type(x.bind_context(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_context(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_context_result
@@ -209,7 +209,7 @@
     def test(param: int) -> RequiresContextResult[bool, float, str]:
         ...
 
-    reveal_type(x.bind_context_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_context_result(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_bind_context_ioresult
@@ -222,7 +222,7 @@
     def test(param: int) -> RequiresContextIOResult[bool, float, str]:
         ...
 
-    reveal_type(x.bind_context_ioresult(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_context_ioresult(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[bool, float, str]"
 
 
 - case: requires_context_future_result_lash
@@ -235,7 +235,7 @@
     def test(param: float) -> RequiresContextFutureResult[int, bool, str]:
         ...
 
-    reveal_type(x.lash(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(x.lash(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: requires_context_future_result_alt
@@ -248,7 +248,7 @@
     def test(param: float) -> bool:
         ...
 
-    reveal_type(x.alt(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(x.alt(test))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: requires_context_future_result_modify_env
@@ -257,4 +257,4 @@
     from returns.context import RequiresContextFutureResult
 
     first: RequiresContextFutureResult[float, bool, int]
-    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.bool]"
+    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "returns.future.FutureResult[float, bool]"
diff --git a/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_cast.yml b/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_cast.yml
index 8072dbec4..b35e6ece9 100644
--- a/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_cast.yml
+++ b/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_cast.yml
@@ -4,7 +4,7 @@
     from returns.context import RequiresContextFutureResult
 
     first: RequiresContextFutureResult[object, Exception, str] = RequiresContextFutureResult.from_value(1)
-    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[object, Exception, str]"
 
 
 - case: requires_context_future_result_failure_cast
@@ -13,7 +13,7 @@
     from returns.context import RequiresContextFutureResult
 
     first: RequiresContextFutureResult[object, Exception, str] = RequiresContextFutureResult.from_failure(TypeError())
-    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[object, Exception, str]"
 
 
 - case: requires_context_future_result_env_cast
@@ -24,7 +24,7 @@
     first: RequiresContextFutureResult[object, Exception, object]
     second: RequiresContextFutureResult[object, Exception, str] = first
 
-    reveal_type(second)  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(second)  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[object, Exception, str]"
 
 
 - case: requires_context_future_result_wrong_cast
diff --git a/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_unit.yml b/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_unit.yml
index d2d36454e..4709de49f 100644
--- a/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_unit.yml
+++ b/typesafety/test_context/test_requires_context_future_result/test_requires_context_future_result_unit.yml
@@ -3,7 +3,7 @@
   main: |
     from returns.context import RequiresContextFutureResult
 
-    reveal_type(RequiresContextFutureResult.from_value(1))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, Any, Any]"
+    reveal_type(RequiresContextFutureResult.from_value(1))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, Any, Any]"
 
 
 - case: requires_context_future_result_failure
@@ -11,7 +11,7 @@
   main: |
     from returns.context import RequiresContextFutureResult
 
-    reveal_type(RequiresContextFutureResult.from_failure(1))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, builtins.int, Any]"
+    reveal_type(RequiresContextFutureResult.from_failure(1))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, int, Any]"
 
 
 - case: requires_context_future_result_result
@@ -22,7 +22,7 @@
 
     r: Result[int, str]
 
-    reveal_type(RequiresContextFutureResult.from_result(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, Any]"
+    reveal_type(RequiresContextFutureResult.from_result(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, Any]"
 
 
 - case: requires_context_future_result_io
@@ -33,7 +33,7 @@
 
     r: IO[int]
 
-    reveal_type(RequiresContextFutureResult.from_io(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, Any, Any]"
+    reveal_type(RequiresContextFutureResult.from_io(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, Any, Any]"
 
 
 - case: requires_context_future_result_failed_io
@@ -44,7 +44,7 @@
 
     r: IO[int]
 
-    reveal_type(RequiresContextFutureResult.from_failed_io(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, builtins.int, Any]"
+    reveal_type(RequiresContextFutureResult.from_failed_io(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, int, Any]"
 
 
 - case: requires_context_future_result_ioresult
@@ -55,7 +55,7 @@
 
     r: IOResult[int, str]
 
-    reveal_type(RequiresContextFutureResult.from_ioresult(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, Any]"
+    reveal_type(RequiresContextFutureResult.from_ioresult(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, Any]"
 
 
 - case: requires_context_future_result_future
@@ -66,7 +66,7 @@
 
     r: Future[int]
 
-    reveal_type(RequiresContextFutureResult.from_future(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, Any, Any]"
+    reveal_type(RequiresContextFutureResult.from_future(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, Any, Any]"
 
 
 - case: requires_context_future_result_failed_future
@@ -77,7 +77,7 @@
 
     r: Future[int]
 
-    reveal_type(RequiresContextFutureResult.from_failed_future(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, builtins.int, Any]"
+    reveal_type(RequiresContextFutureResult.from_failed_future(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, int, Any]"
 
 
 - case: requires_context_future_result_future_result
@@ -88,7 +88,7 @@
 
     r: FutureResult[int, str]
 
-    reveal_type(RequiresContextFutureResult.from_future_result(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, Any]"
+    reveal_type(RequiresContextFutureResult.from_future_result(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, Any]"
 
 
 - case: requires_context_future_result_typecast
@@ -99,7 +99,7 @@
 
     r: RequiresContext[FutureResult[int, str], float]
 
-    reveal_type(RequiresContextFutureResult.from_typecast(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.float]"
+    reveal_type(RequiresContextFutureResult.from_typecast(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, float]"
 
 
 - case: requires_context_future_result_successful_context
@@ -109,7 +109,7 @@
 
     r: RequiresContext[str, float]
 
-    reveal_type(RequiresContextFutureResult.from_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.str, Any, builtins.float]"
+    reveal_type(RequiresContextFutureResult.from_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[str, Any, float]"
 
 
 - case: requires_context_future_result_failed_context
@@ -119,7 +119,7 @@
 
     r: RequiresContext[str, float]
 
-    reveal_type(RequiresContextFutureResult.from_failed_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, builtins.str, builtins.float]"
+    reveal_type(RequiresContextFutureResult.from_failed_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[Any, str, float]"
 
 
 - case: requires_context_future_result_from_result_context
@@ -129,7 +129,7 @@
 
     r: RequiresContextResult[int, str, float]
 
-    reveal_type(RequiresContextFutureResult.from_result_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.float]"
+    reveal_type(RequiresContextFutureResult.from_result_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, float]"
 
 
 - case: requires_context_future_result_from_ioresult_context
@@ -139,4 +139,4 @@
 
     r: RequiresContextIOResult[int, str, float]
 
-    reveal_type(RequiresContextFutureResult.from_ioresult_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.float]"
+    reveal_type(RequiresContextFutureResult.from_ioresult_context(r))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, float]"
diff --git a/typesafety/test_context/test_requires_context_ioresult/test_context_ioresult.yml b/typesafety/test_context/test_requires_context_ioresult/test_context_ioresult.yml
index 8fad64546..2a7618d1d 100644
--- a/typesafety/test_context/test_requires_context_ioresult/test_context_ioresult.yml
+++ b/typesafety/test_context/test_requires_context_ioresult/test_context_ioresult.yml
@@ -11,4 +11,4 @@
   main: |
     from returns.context import RequiresContextIOResult
 
-    reveal_type(RequiresContextIOResult[int, bool, str].ask())  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.str, builtins.bool, builtins.str]"
+    reveal_type(RequiresContextIOResult[int, bool, str].ask())  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[str, bool, str]"
diff --git a/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult.yml b/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult.yml
index b85df53fd..ca14a8a9e 100644
--- a/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult.yml
+++ b/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult.yml
@@ -5,7 +5,7 @@
 
     x: RequiresContextIOResult[int, float, str]
 
-    reveal_type(x('a'))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.float]"
+    reveal_type(x('a'))  # N: Revealed type is "returns.io.IOResult[int, float]"
 
 
 - case: requires_context_ioresult_getattr
@@ -24,7 +24,7 @@
 
     x: RequiresContextIOResult[int, float, str]
 
-    reveal_type(x.swap())  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.int, builtins.str]"
+    reveal_type(x.swap())  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[float, int, str]"
 
 
 - case: requires_context_ioresult_bind
@@ -37,7 +37,7 @@
     def test(param: int) -> RequiresContextIOResult[bool, float, str]:
         ...
 
-    reveal_type(x.bind(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 - case: requires_context_ioresult_bind_result
@@ -51,7 +51,7 @@
     def test(param: int) -> Result[bool, float]:
         ...
 
-    reveal_type(x.bind_result(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_result(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 - case: requires_context_ioresult_bind_ioresult
@@ -65,7 +65,7 @@
     def test(param: int) -> IOResult[bool, float]:
         ...
 
-    reveal_type(x.bind_ioresult(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_ioresult(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 - case: requires_context_ioresult_bind_io
@@ -79,7 +79,7 @@
     def test(param: int) -> IO[bool]:
         ...
 
-    reveal_type(x.bind_io(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_io(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 - case: requires_context_ioresult_bind_context
@@ -92,7 +92,7 @@
     def test(param: int) -> RequiresContext[bool, str]:
         ...
 
-    reveal_type(x.bind_context(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_context(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 
@@ -106,7 +106,7 @@
     def test(param: int) -> RequiresContextResult[bool, float, str]:
         ...
 
-    reveal_type(x.bind_context_result(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_context_result(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 - case: requires_context_ioresult_map
@@ -116,7 +116,7 @@
 
     x: RequiresContextIOResult[int, float, str]
 
-    reveal_type(x.map(bool))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.map(bool))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 - case: requires_context_ioresult_apply
@@ -128,7 +128,7 @@
     x: RequiresContextIOResult[int, float, str]
     y: RequiresContextIOResult[Callable[[int], bool], float, str]
 
-    reveal_type(x.apply(y))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.apply(y))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, float, str]"
 
 
 - case: requires_context_ioresult_lash
@@ -141,7 +141,7 @@
     def test(param: float) -> RequiresContextIOResult[int, bool, str]:
         ...
 
-    reveal_type(x.lash(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(x.lash(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, bool, str]"
 
 
 - case: requires_context_ioresult_alt
@@ -154,7 +154,7 @@
     def test(param: float) -> bool:
         ...
 
-    reveal_type(x.alt(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(x.alt(test))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, bool, str]"
 
 
 - case: requires_context_ioresult_modify_env
@@ -163,4 +163,4 @@
     from returns.context import RequiresContextIOResult
 
     first: RequiresContextIOResult[float, bool, int]
-    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "returns.io.IOResult[builtins.float, builtins.bool]"
+    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "returns.io.IOResult[float, bool]"
diff --git a/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_cast.yml b/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_cast.yml
index 0c6c29f57..090939d24 100644
--- a/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_cast.yml
+++ b/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_cast.yml
@@ -4,7 +4,7 @@
     from returns.context import RequiresContextIOResult
 
     first: RequiresContextIOResult[object, Exception, str] = RequiresContextIOResult.from_value(1)
-    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[object, Exception, str]"
 
 
 - case: requires_context_ioresult_failure_cast
@@ -13,7 +13,7 @@
     from returns.context import RequiresContextIOResult
 
     first: RequiresContextIOResult[object, Exception, str] = RequiresContextIOResult.from_failure(TypeError())
-    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[object, Exception, str]"
 
 
 - case: requires_context_ioresult_env_cast
@@ -24,7 +24,7 @@
     first: RequiresContextIOResult[object, Exception, object]
     second: RequiresContextIOResult[object, Exception, str] = first
 
-    reveal_type(second)  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(second)  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[object, Exception, str]"
 
 
 - case: requires_context_ioresult_wrong_cast
diff --git a/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_unit.yml b/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_unit.yml
index 0473ed342..7f080b70c 100644
--- a/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_unit.yml
+++ b/typesafety/test_context/test_requires_context_ioresult/test_requires_context_ioresult_unit.yml
@@ -3,7 +3,7 @@
   main: |
     from returns.context import RequiresContextIOResult
 
-    reveal_type(RequiresContextIOResult.from_value(1))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, Any, Any]"
+    reveal_type(RequiresContextIOResult.from_value(1))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, Any, Any]"
 
 
 - case: requires_context_ioresult_failure
@@ -11,7 +11,7 @@
   main: |
     from returns.context import RequiresContextIOResult
 
-    reveal_type(RequiresContextIOResult.from_failure(1))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[Any, builtins.int, Any]"
+    reveal_type(RequiresContextIOResult.from_failure(1))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[Any, int, Any]"
 
 
 - case: requires_context_ioresult_result
@@ -22,7 +22,7 @@
 
     r: Result[int, str]
 
-    reveal_type(RequiresContextIOResult.from_result(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, Any]"
+    reveal_type(RequiresContextIOResult.from_result(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, Any]"
 
 
 - case: requires_context_ioresult_io
@@ -33,7 +33,7 @@
 
     r: IO[int]
 
-    reveal_type(RequiresContextIOResult.from_io(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, Any, Any]"
+    reveal_type(RequiresContextIOResult.from_io(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, Any, Any]"
 
 
 - case: requires_context_ioresult_failed_io
@@ -44,7 +44,7 @@
 
     r: IO[int]
 
-    reveal_type(RequiresContextIOResult.from_failed_io(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[Any, builtins.int, Any]"
+    reveal_type(RequiresContextIOResult.from_failed_io(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[Any, int, Any]"
 
 
 - case: requires_context_ioresult_ioresult
@@ -55,7 +55,7 @@
 
     r: IOResult[int, str]
 
-    reveal_type(RequiresContextIOResult.from_ioresult(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, Any]"
+    reveal_type(RequiresContextIOResult.from_ioresult(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, Any]"
 
 
 - case: requires_context_ioresult_typecast
@@ -66,7 +66,7 @@
 
     r: RequiresContext[IOResult[int, str], float]
 
-    reveal_type(RequiresContextIOResult.from_typecast(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.float]"
+    reveal_type(RequiresContextIOResult.from_typecast(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, float]"
 
 
 - case: requires_context_ioresult_successful_context
@@ -76,7 +76,7 @@
 
     r: RequiresContext[str, float]
 
-    reveal_type(RequiresContextIOResult.from_context(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.str, Any, builtins.float]"
+    reveal_type(RequiresContextIOResult.from_context(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[str, Any, float]"
 
 
 - case: requires_context_ioresult_failed_context
@@ -86,7 +86,7 @@
 
     r: RequiresContext[str, float]
 
-    reveal_type(RequiresContextIOResult.from_failed_context(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[Any, builtins.str, builtins.float]"
+    reveal_type(RequiresContextIOResult.from_failed_context(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[Any, str, float]"
 
 
 - case: requires_context_ioresult_from_result_context
@@ -96,4 +96,4 @@
 
     r: RequiresContextResult[int, str, float]
 
-    reveal_type(RequiresContextIOResult.from_result_context(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.float]"
+    reveal_type(RequiresContextIOResult.from_result_context(r))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, float]"
diff --git a/typesafety/test_context/test_requires_context_result/test_context_result.yml b/typesafety/test_context/test_requires_context_result/test_context_result.yml
index 4f899646d..9543148aa 100644
--- a/typesafety/test_context/test_requires_context_result/test_context_result.yml
+++ b/typesafety/test_context/test_requires_context_result/test_context_result.yml
@@ -11,4 +11,4 @@
   main: |
     from returns.context import RequiresContextResult
 
-    reveal_type(RequiresContextResult[int, bool, str].ask())  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.str, builtins.bool, builtins.str]"
+    reveal_type(RequiresContextResult[int, bool, str].ask())  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[str, bool, str]"
diff --git a/typesafety/test_context/test_requires_context_result/test_requires_context_cast.yml b/typesafety/test_context/test_requires_context_result/test_requires_context_cast.yml
index 8d586526c..50722c63c 100644
--- a/typesafety/test_context/test_requires_context_result/test_requires_context_cast.yml
+++ b/typesafety/test_context/test_requires_context_result/test_requires_context_cast.yml
@@ -4,7 +4,7 @@
     from returns.context import RequiresContextResult
 
     first: RequiresContextResult[object, Exception, str] = RequiresContextResult.from_value(1)
-    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[object, Exception, str]"
 
 
 - case: requires_context_result_failure_cast
@@ -13,7 +13,7 @@
     from returns.context import RequiresContextResult
 
     first: RequiresContextResult[object, Exception, str] = RequiresContextResult.from_failure(TypeError())
-    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(first)  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[object, Exception, str]"
 
 
 - case: requires_context_result_env_cast
@@ -24,7 +24,7 @@
     first: RequiresContextResult[object, Exception, object]
     second: RequiresContextResult[object, Exception, str] = first
 
-    reveal_type(second)  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.object, builtins.Exception, builtins.str]"
+    reveal_type(second)  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[object, Exception, str]"
 
 
 - case: requires_context_result_wrong_cast
diff --git a/typesafety/test_context/test_requires_context_result/test_requires_context_result.yml b/typesafety/test_context/test_requires_context_result/test_requires_context_result.yml
index 5b7a7ba25..95278003f 100644
--- a/typesafety/test_context/test_requires_context_result/test_requires_context_result.yml
+++ b/typesafety/test_context/test_requires_context_result/test_requires_context_result.yml
@@ -5,7 +5,7 @@
 
     x: RequiresContextResult[int, Exception, str]
 
-    reveal_type(x('a'))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(x('a'))  # N: Revealed type is "returns.result.Result[int, Exception]"
 
 
 - case: requires_context_result_getattr
@@ -24,7 +24,7 @@
 
     x: RequiresContextResult[int, float, str]
 
-    reveal_type(x.swap())  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.float, builtins.int, builtins.str]"
+    reveal_type(x.swap())  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[float, int, str]"
 
 
 - case: requires_context_result_bind
@@ -37,7 +37,7 @@
     def test(param: int) -> RequiresContextResult[bool, float, str]:
         ...
 
-    reveal_type(x.bind(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[bool, float, str]"
 
 
 - case: requires_context_result_bind_result
@@ -51,7 +51,7 @@
     def test(param: int) -> Result[bool, float]:
         ...
 
-    reveal_type(x.bind_result(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_result(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[bool, float, str]"
 
 
 - case: requires_context_result_bind_context
@@ -64,7 +64,7 @@
     def test(param: int) -> RequiresContext[bool, str]:
         ...
 
-    reveal_type(x.bind_context(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.bind_context(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[bool, float, str]"
 
 
 - case: requires_context_result_map
@@ -74,7 +74,7 @@
 
     x: RequiresContextResult[int, float, str]
 
-    reveal_type(x.map(bool))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.map(bool))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[bool, float, str]"
 
 
 - case: requires_context_result_apply
@@ -86,7 +86,7 @@
     x: RequiresContextResult[int, float, str]
     y: RequiresContextResult[Callable[[int], bool], float, str]
 
-    reveal_type(x.apply(y))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.bool, builtins.float, builtins.str]"
+    reveal_type(x.apply(y))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[bool, float, str]"
 
 
 - case: requires_context_result_lash
@@ -99,7 +99,7 @@
     def test(param: float) -> RequiresContextResult[int, bool, str]:
         ...
 
-    reveal_type(x.lash(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(x.lash(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, bool, str]"
 
 
 - case: requires_context_result_alt
@@ -112,7 +112,7 @@
     def test(param: float) -> bool:
         ...
 
-    reveal_type(x.alt(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(x.alt(test))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, bool, str]"
 
 
 - case: requires_context_result_modify_env
@@ -121,4 +121,4 @@
     from returns.context import RequiresContextResult
 
     first: RequiresContextResult[float, bool, int]
-    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.bool]"
+    reveal_type(first.modify_env(int)('1'))  # N: Revealed type is "returns.result.Result[float, bool]"
diff --git a/typesafety/test_context/test_requires_context_result/test_requires_context_result_unit.yml b/typesafety/test_context/test_requires_context_result/test_requires_context_result_unit.yml
index 1cc6100b8..fddeeaa80 100644
--- a/typesafety/test_context/test_requires_context_result/test_requires_context_result_unit.yml
+++ b/typesafety/test_context/test_requires_context_result/test_requires_context_result_unit.yml
@@ -3,7 +3,7 @@
   main: |
     from returns.context import RequiresContextResult
 
-    reveal_type(RequiresContextResult.from_value(1))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, Any, Any]"
+    reveal_type(RequiresContextResult.from_value(1))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, Any, Any]"
 
 
 - case: requires_context_result_failure
@@ -11,7 +11,7 @@
   main: |
     from returns.context import RequiresContextResult
 
-    reveal_type(RequiresContextResult.from_failure(1))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[Any, builtins.int, Any]"
+    reveal_type(RequiresContextResult.from_failure(1))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[Any, int, Any]"
 
 
 - case: requires_context_result_result
@@ -22,7 +22,7 @@
 
     r: Result[int, str]
 
-    reveal_type(RequiresContextResult.from_result(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.str, Any]"
+    reveal_type(RequiresContextResult.from_result(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, str, Any]"
 
 
 - case: requires_context_result_typecast
@@ -33,7 +33,7 @@
 
     r: RequiresContext[Result[int, str], float]
 
-    reveal_type(RequiresContextResult.from_typecast(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.str, builtins.float]"
+    reveal_type(RequiresContextResult.from_typecast(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, str, float]"
 
 
 - case: requires_context_result_successful_context
@@ -43,7 +43,7 @@
 
     r: RequiresContext[str, float]
 
-    reveal_type(RequiresContextResult.from_context(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.str, Any, builtins.float]"
+    reveal_type(RequiresContextResult.from_context(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[str, Any, float]"
 
 
 - case: requires_context_result_failed_context
@@ -53,4 +53,4 @@
 
     r: RequiresContext[str, float]
 
-    reveal_type(RequiresContextResult.from_failed_context(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[Any, builtins.str, builtins.float]"
+    reveal_type(RequiresContextResult.from_failed_context(r))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[Any, str, float]"
diff --git a/typesafety/test_converters/test_flatten.yml b/typesafety/test_converters/test_flatten.yml
index 02e9c131f..e4a5112ea 100644
--- a/typesafety/test_converters/test_flatten.yml
+++ b/typesafety/test_converters/test_flatten.yml
@@ -42,7 +42,7 @@
         ...
 
     x: MyClass[MyClass[int]]
-    reveal_type(flatten(x))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(flatten(x))  # N: Revealed type is "main.MyClass[int]"
 
 
 - case: flatten_wrong_flatten_error_type
@@ -65,7 +65,7 @@
     from returns.converters import flatten
     from returns.io import IO
 
-    reveal_type(flatten(IO(IO(1))))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(flatten(IO(IO(1))))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: flatten_maybe
@@ -74,7 +74,7 @@
     from returns.converters import flatten
     from returns.maybe import Some
 
-    reveal_type(flatten(Some(Some(1))))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(flatten(Some(Some(1))))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: flatten_result
@@ -86,7 +86,7 @@
     def returns_result() -> Result[Result[int, str], str]:
         ...
 
-    reveal_type(flatten(returns_result()))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(flatten(returns_result()))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: flatten_ioresult
@@ -98,7 +98,7 @@
     def returns_ioresult() -> IOResult[IOResult[int, str], str]:
         ...
 
-    reveal_type(flatten(returns_ioresult()))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(flatten(returns_ioresult()))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: flatten_context
@@ -109,7 +109,7 @@
 
     x: RequiresContext[RequiresContext[str, int], int]
 
-    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.str, builtins.int]"
+    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[str, int]"
 
 
 - case: flatten_context_result
@@ -120,7 +120,7 @@
 
     x: RequiresContextResult[RequiresContextResult[str, int, float], int, float]
 
-    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.str, builtins.int, builtins.float]"
+    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[str, int, float]"
 
 
 - case: flatten_context_ioresult
@@ -131,7 +131,7 @@
 
     x: RequiresContextIOResult[RequiresContextIOResult[str, int, float], int, float]
 
-    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.str, builtins.int, builtins.float]"
+    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[str, int, float]"
 
 
 - case: flatten_context_ioresult
@@ -142,7 +142,7 @@
 
     x: RequiresContextIOResult[RequiresContextIOResult[str, int, float], int, float]
 
-    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.str, builtins.int, builtins.float]"
+    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[str, int, float]"
 
 
 - case: flatten_future_result
@@ -153,7 +153,7 @@
 
     x: ReaderFutureResult[ReaderFutureResult[int, bool, str], bool, str]
 
-    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(flatten(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: flatten_future_result
@@ -164,4 +164,4 @@
 
     x: FutureResult[FutureResult[int, str], str]
 
-    reveal_type(flatten(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(flatten(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
diff --git a/typesafety/test_converters/test_maybe_to_result.yml b/typesafety/test_converters/test_maybe_to_result.yml
index 6a99eebe9..503b1ecab 100644
--- a/typesafety/test_converters/test_maybe_to_result.yml
+++ b/typesafety/test_converters/test_maybe_to_result.yml
@@ -4,7 +4,7 @@
     from returns.converters import maybe_to_result
     from returns.maybe import Maybe
 
-    reveal_type(maybe_to_result(Maybe.from_value(1)))  # N: Revealed type is "returns.result.Result[builtins.int, None]"
+    reveal_type(maybe_to_result(Maybe.from_value(1)))  # N: Revealed type is "returns.result.Result[int, None]"
 
 
 - case: maybe_to_result_default_error
@@ -13,4 +13,4 @@
     from returns.converters import maybe_to_result
     from returns.maybe import Maybe
 
-    reveal_type(maybe_to_result(Maybe.from_value(1), 'a'))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(maybe_to_result(Maybe.from_value(1), 'a'))  # N: Revealed type is "returns.result.Result[int, str]"
diff --git a/typesafety/test_converters/test_result_to_maybe.yml b/typesafety/test_converters/test_result_to_maybe.yml
index bd81f86ed..077b290b6 100644
--- a/typesafety/test_converters/test_result_to_maybe.yml
+++ b/typesafety/test_converters/test_result_to_maybe.yml
@@ -7,4 +7,4 @@
     def returns_result() -> Result[int, str]:
         ...
 
-    reveal_type(result_to_maybe(returns_result()))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(result_to_maybe(returns_result()))  # N: Revealed type is "returns.maybe.Maybe[int]"
diff --git a/typesafety/test_curry/test_curry/test_curry.yml b/typesafety/test_curry/test_curry/test_curry.yml
index dbe26bbd2..1378d1b86 100644
--- a/typesafety/test_curry/test_curry/test_curry.yml
+++ b/typesafety/test_curry/test_curry/test_curry.yml
@@ -7,8 +7,8 @@
     def zero() -> str:
         ...
 
-    reveal_type(zero)  # N: Revealed type is "def () -> builtins.str"
-    reveal_type(zero())  # N: Revealed type is "builtins.str"
+    reveal_type(zero)  # N: Revealed type is "def () -> str"
+    reveal_type(zero())  # N: Revealed type is "str"
 
 
 - case: curry_single_arg
@@ -20,8 +20,8 @@
     def zero(arg: int) -> str:
         ...
 
-    reveal_type(zero)  # N: Revealed type is "def (arg: builtins.int) -> builtins.str"
-    reveal_type(zero(1))  # N: Revealed type is "builtins.str"
+    reveal_type(zero)  # N: Revealed type is "def (arg: int) -> str"
+    reveal_type(zero(1))  # N: Revealed type is "str"
 
 
 - case: curry_two_args1
@@ -33,10 +33,10 @@
     def zero(arg: int, other: float) -> str:
         ...
 
-    reveal_type(zero)  # N: Revealed type is "Overload(def (arg: builtins.int) -> def (other: builtins.float) -> builtins.str, def (arg: builtins.int, other: builtins.float) -> builtins.str)"
-    reveal_type(zero(1))  # N: Revealed type is "def (other: builtins.float) -> builtins.str"
-    reveal_type(zero(1, 2.0))  # N: Revealed type is "builtins.str"
-    reveal_type(zero(1)(2.0))  # N: Revealed type is "builtins.str"
+    reveal_type(zero)  # N: Revealed type is "Overload(def (arg: int) -> def (other: float) -> str, def (arg: int, other: float) -> str)"
+    reveal_type(zero(1))  # N: Revealed type is "def (other: float) -> str"
+    reveal_type(zero(1, 2.0))  # N: Revealed type is "str"
+    reveal_type(zero(1)(2.0))  # N: Revealed type is "str"
 
 
 - case: curry_two_args2
@@ -47,10 +47,10 @@
     def zero(arg: int, other: float) -> str:
         ...
 
-    reveal_type(curry(zero))  # N: Revealed type is "Overload(def (arg: builtins.int) -> def (other: builtins.float) -> builtins.str, def (arg: builtins.int, other: builtins.float) -> builtins.str)"
-    reveal_type(curry(zero)(1))  # N: Revealed type is "def (other: builtins.float) -> builtins.str"
-    reveal_type(curry(zero)(1, 2.0))  # N: Revealed type is "builtins.str"
-    reveal_type(curry(zero)(1)(2.0))  # N: Revealed type is "builtins.str"
+    reveal_type(curry(zero))  # N: Revealed type is "Overload(def (arg: int) -> def (other: float) -> str, def (arg: int, other: float) -> str)"
+    reveal_type(curry(zero)(1))  # N: Revealed type is "def (other: float) -> str"
+    reveal_type(curry(zero)(1, 2.0))  # N: Revealed type is "str"
+    reveal_type(curry(zero)(1)(2.0))  # N: Revealed type is "str"
 
 
 - case: curry_two_args3
@@ -92,10 +92,10 @@
     def zero(arg: int, other: float = 1.0) -> str:
         ...
 
-    reveal_type(zero)  # N: Revealed type is "Overload(def (arg: builtins.int) -> def (other: builtins.float =) -> builtins.str, def (arg: builtins.int, other: builtins.float =) -> builtins.str)"
-    reveal_type(zero(1))  # N: Revealed type is "def (other: builtins.float =) -> builtins.str"
-    reveal_type(zero(1, 2.0))  # N: Revealed type is "builtins.str"
-    reveal_type(zero(1)(2.0))  # N: Revealed type is "builtins.str"
+    reveal_type(zero)  # N: Revealed type is "Overload(def (arg: int) -> def (other: float =) -> str, def (arg: int, other: float =) -> str)"
+    reveal_type(zero(1))  # N: Revealed type is "def (other: float =) -> str"
+    reveal_type(zero(1, 2.0))  # N: Revealed type is "str"
+    reveal_type(zero(1)(2.0))  # N: Revealed type is "str"
 
 
 - case: curry_three_args
@@ -107,10 +107,10 @@
     def zero(arg: int, other: float, *, kw: bool) -> str:
         ...
 
-    reveal_type(zero)  # N: Revealed type is "Overload(def (arg: builtins.int) -> Overload(def (other: builtins.float, *, kw: builtins.bool) -> builtins.str, def (other: builtins.float) -> def (*, kw: builtins.bool) -> builtins.str), def (arg: builtins.int, other: builtins.float) -> def (*, kw: builtins.bool) -> builtins.str, def (arg: builtins.int, other: builtins.float, *, kw: builtins.bool) -> builtins.str)"
-    reveal_type(zero(1))  # N: Revealed type is "Overload(def (other: builtins.float, *, kw: builtins.bool) -> builtins.str, def (other: builtins.float) -> def (*, kw: builtins.bool) -> builtins.str)"
-    reveal_type(zero(1, 2.0))  # N: Revealed type is "def (*, kw: builtins.bool) -> builtins.str"
-    reveal_type(zero(1)(2.0))  # N: Revealed type is "def (*, kw: builtins.bool) -> builtins.str"
-    reveal_type(zero(1, 2.0)(kw=True))  # N: Revealed type is "builtins.str"
-    reveal_type(zero(1)(2.0)(kw=True))  # N: Revealed type is "builtins.str"
-    reveal_type(zero(1, 2.0, kw=True))  # N: Revealed type is "builtins.str"
+    reveal_type(zero)  # N: Revealed type is "Overload(def (arg: int) -> Overload(def (other: float, *, kw: bool) -> str, def (other: float) -> def (*, kw: bool) -> str), def (arg: int, other: float) -> def (*, kw: bool) -> str, def (arg: int, other: float, *, kw: bool) -> str)"
+    reveal_type(zero(1))  # N: Revealed type is "Overload(def (other: float, *, kw: bool) -> str, def (other: float) -> def (*, kw: bool) -> str)"
+    reveal_type(zero(1, 2.0))  # N: Revealed type is "def (*, kw: bool) -> str"
+    reveal_type(zero(1)(2.0))  # N: Revealed type is "def (*, kw: bool) -> str"
+    reveal_type(zero(1, 2.0)(kw=True))  # N: Revealed type is "str"
+    reveal_type(zero(1)(2.0)(kw=True))  # N: Revealed type is "str"
+    reveal_type(zero(1, 2.0, kw=True))  # N: Revealed type is "str"
diff --git a/typesafety/test_curry/test_curry/test_curry_arguments.yml b/typesafety/test_curry/test_curry/test_curry_arguments.yml
index 88c0ab10b..7125b022d 100644
--- a/typesafety/test_curry/test_curry/test_curry_arguments.yml
+++ b/typesafety/test_curry/test_curry/test_curry_arguments.yml
@@ -13,7 +13,7 @@
     ) -> str:
         ...
 
-    reveal_type(multiple)  # N: Revealed type is "Overload(def (builtins.int) -> Overload(def (builtins.int, builtins.int, d: builtins.int) -> builtins.str, def (builtins.int, builtins.int) -> def (d: builtins.int) -> builtins.str, def (builtins.int) -> Overload(def (builtins.int, d: builtins.int) -> builtins.str, def (builtins.int) -> def (d: builtins.int) -> builtins.str)), def (builtins.int, builtins.int) -> Overload(def (builtins.int, d: builtins.int) -> builtins.str, def (builtins.int) -> def (d: builtins.int) -> builtins.str), def (builtins.int, builtins.int, builtins.int) -> def (d: builtins.int) -> builtins.str, def (builtins.int, builtins.int, builtins.int, d: builtins.int) -> builtins.str)"
+    reveal_type(multiple)  # N: Revealed type is "Overload(def (int) -> Overload(def (int, int, d: int) -> str, def (int, int) -> def (d: int) -> str, def (int) -> Overload(def (int, d: int) -> str, def (int) -> def (d: int) -> str)), def (int, int) -> Overload(def (int, d: int) -> str, def (int) -> def (d: int) -> str), def (int, int, int) -> def (d: int) -> str, def (int, int, int, d: int) -> str)"
 
 
 - case: curry_nested_overload1
@@ -34,7 +34,7 @@
     def test(a: int, b: int) -> float:
         ...
 
-    reveal_type(MyClass(test))  # N: Revealed type is "main.MyClass[Overload(def (a: builtins.int) -> def (b: builtins.int) -> builtins.float, def (a: builtins.int, b: builtins.int) -> builtins.float)]"
+    reveal_type(MyClass(test))  # N: Revealed type is "main.MyClass[Overload(def (a: int) -> def (b: int) -> float, def (a: int, b: int) -> float)]"
 
 
 - case: curry_nested_overload2
@@ -55,7 +55,7 @@
     def test(a: int, b: int, c: str) -> int:
         ...
 
-    reveal_type(MyClass(test))  # N: Revealed type is "main.MyClass[Overload(def (a: builtins.int) -> Overload(def (b: builtins.int, c: builtins.str) -> builtins.int, def (b: builtins.int) -> def (c: builtins.str) -> builtins.int), def (a: builtins.int, b: builtins.int) -> def (c: builtins.str) -> builtins.int, def (a: builtins.int, b: builtins.int, c: builtins.str) -> builtins.int)]"
+    reveal_type(MyClass(test))  # N: Revealed type is "main.MyClass[Overload(def (a: int) -> Overload(def (b: int, c: str) -> int, def (b: int) -> def (c: str) -> int), def (a: int, b: int) -> def (c: str) -> int, def (a: int, b: int, c: str) -> int)]"
 
 
 - case: curry_init_magic_method
@@ -69,7 +69,7 @@
         def __init__(self, arg: int, other: str) -> None:
             ...
 
-    reveal_type(Test)  # N: Revealed type is "Overload(def () -> main.Test, def (arg: builtins.int) -> main.Test, def (arg: builtins.int, other: builtins.str) -> main.Test)"
+    reveal_type(Test)  # N: Revealed type is "Overload(def () -> main.Test, def (arg: int) -> main.Test, def (arg: int, other: str) -> main.Test)"
 
 
 - case: curry_call_magic_method
@@ -82,7 +82,7 @@
         def __call__(self, arg: int, other: float, last: str) -> str:
             ...
 
-    reveal_type(Test()(1))  # N: Revealed type is "Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str)"
+    reveal_type(Test()(1))  # N: Revealed type is "Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str)"
 
 
 - case: curry_classmethod1
@@ -96,11 +96,11 @@
         def some(cls, arg: int, other: float, last: str) -> str:
             ...
 
-    reveal_type(Test.some)  # N: Revealed type is "Overload(def () -> Overload(def (arg: builtins.int, other: builtins.float, last: builtins.str) -> builtins.str, def (arg: builtins.int, other: builtins.float) -> def (last: builtins.str) -> builtins.str, def (arg: builtins.int) -> Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str)), def (arg: builtins.int) -> Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str), def (arg: builtins.int, other: builtins.float) -> def (last: builtins.str) -> builtins.str, def (arg: builtins.int, other: builtins.float, last: builtins.str) -> builtins.str)"
+    reveal_type(Test.some)  # N: Revealed type is "Overload(def () -> Overload(def (arg: int, other: float, last: str) -> str, def (arg: int, other: float) -> def (last: str) -> str, def (arg: int) -> Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str)), def (arg: int) -> Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str), def (arg: int, other: float) -> def (last: str) -> str, def (arg: int, other: float, last: str) -> str)"
 
-    reveal_type(Test.some(1))  # N: Revealed type is "Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str)"
+    reveal_type(Test.some(1))  # N: Revealed type is "Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str)"
 
-    reveal_type(Test.some(1, 2.0, 'a'))  # N: Revealed type is "builtins.str"
+    reveal_type(Test.some(1, 2.0, 'a'))  # N: Revealed type is "str"
 
 
 - case: curry_classmethod2
@@ -118,7 +118,7 @@
     def test(c: Callable[[int, str], str]) -> str:
         return c(1, 'a')
 
-    reveal_type(test(Test.some))  # N: Revealed type is "builtins.str"
+    reveal_type(test(Test.some))  # N: Revealed type is "str"
 
 
 - case: curry_classmethod3
@@ -136,7 +136,7 @@
     def test(c: Callable[[int, str], str]) -> str:
         return c(1, 'a')
 
-    reveal_type(test(Test.some('a')))  # N: Revealed type is "builtins.str"
+    reveal_type(test(Test.some('a')))  # N: Revealed type is "str"
 
 
 - case: curry_staticmethod
@@ -150,7 +150,7 @@
         def some(arg: int, other: float, last: str) -> str:
             ...
 
-    reveal_type(Test.some)  # N: Revealed type is "Overload(def (arg: builtins.int) -> Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str), def (arg: builtins.int, other: builtins.float) -> def (last: builtins.str) -> builtins.str, def (arg: builtins.int, other: builtins.float, last: builtins.str) -> builtins.str)"
+    reveal_type(Test.some)  # N: Revealed type is "Overload(def (arg: int) -> Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str), def (arg: int, other: float) -> def (last: str) -> str, def (arg: int, other: float, last: str) -> str)"
 
 
 - case: curry_regular_method
@@ -163,13 +163,13 @@
         def some(self, arg: int, other: float, last: str) -> str:
             ...
 
-    reveal_type(Test.some)  # N: Revealed type is "Overload(def (self: main.Test) -> Overload(def (arg: builtins.int, other: builtins.float, last: builtins.str) -> builtins.str, def (arg: builtins.int, other: builtins.float) -> def (last: builtins.str) -> builtins.str, def (arg: builtins.int) -> Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str)), def (self: main.Test, arg: builtins.int) -> Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str), def (self: main.Test, arg: builtins.int, other: builtins.float) -> def (last: builtins.str) -> builtins.str, def (self: main.Test, arg: builtins.int, other: builtins.float, last: builtins.str) -> builtins.str)"
+    reveal_type(Test.some)  # N: Revealed type is "Overload(def (self: main.Test) -> Overload(def (arg: int, other: float, last: str) -> str, def (arg: int, other: float) -> def (last: str) -> str, def (arg: int) -> Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str)), def (self: main.Test, arg: int) -> Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str), def (self: main.Test, arg: int, other: float) -> def (last: str) -> str, def (self: main.Test, arg: int, other: float, last: str) -> str)"
 
-    reveal_type(Test.some(Test(), 1))  # N: Revealed type is "Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str)"
+    reveal_type(Test.some(Test(), 1))  # N: Revealed type is "Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str)"
 
-    reveal_type(Test().some)  # N: Revealed type is "Overload(def () -> Overload(def (arg: builtins.int, other: builtins.float, last: builtins.str) -> builtins.str, def (arg: builtins.int, other: builtins.float) -> def (last: builtins.str) -> builtins.str, def (arg: builtins.int) -> Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str)), def (arg: builtins.int) -> Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str), def (arg: builtins.int, other: builtins.float) -> def (last: builtins.str) -> builtins.str, def (arg: builtins.int, other: builtins.float, last: builtins.str) -> builtins.str)"
+    reveal_type(Test().some)  # N: Revealed type is "Overload(def () -> Overload(def (arg: int, other: float, last: str) -> str, def (arg: int, other: float) -> def (last: str) -> str, def (arg: int) -> Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str)), def (arg: int) -> Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str), def (arg: int, other: float) -> def (last: str) -> str, def (arg: int, other: float, last: str) -> str)"
 
-    reveal_type(Test().some(1))  # N: Revealed type is "Overload(def (other: builtins.float, last: builtins.str) -> builtins.str, def (other: builtins.float) -> def (last: builtins.str) -> builtins.str)"
+    reveal_type(Test().some(1))  # N: Revealed type is "Overload(def (other: float, last: str) -> str, def (other: float) -> def (last: str) -> str)"
 
 
 - case: curry_match_callable_protocol1
@@ -186,7 +186,7 @@
     def test(c: Callable[[int, str], str]) -> str:
         return c(1, 'a')
 
-    reveal_type(test(Test().some(1)))  # N: Revealed type is "builtins.str"
+    reveal_type(test(Test().some(1)))  # N: Revealed type is "str"
 
 
 - case: curry_match_callable_protocol2
@@ -203,7 +203,7 @@
     def test(c: Callable[[int, str], str]) -> str:
         return c(1, 'a')
 
-    reveal_type(test(Test().some))  # N: Revealed type is "builtins.str"
+    reveal_type(test(Test().some))  # N: Revealed type is "str"
 
 
 - case: curry_match_callable_protocol3
@@ -220,7 +220,7 @@
     def test(c: Callable[[int], Callable[[float], str]]) -> str:
         return c(1)(5.0)
 
-    reveal_type(test(Test().some))  # N: Revealed type is "builtins.str"
+    reveal_type(test(Test().some))  # N: Revealed type is "str"
 
 
 - case: curry_match_callable_protocol4
@@ -238,4 +238,4 @@
     def test(c: Callable[[int], Callable[[float], str]]) -> str:
         return c(1)(5.0)
 
-    reveal_type(test(Test.some))  # N: Revealed type is "builtins.str"
+    reveal_type(test(Test.some))  # N: Revealed type is "str"
diff --git a/typesafety/test_curry/test_curry/test_curry_generics.yml b/typesafety/test_curry/test_curry/test_curry_generics.yml
index 45679b24e..1a4af932c 100644
--- a/typesafety/test_curry/test_curry/test_curry_generics.yml
+++ b/typesafety/test_curry/test_curry/test_curry_generics.yml
@@ -12,8 +12,8 @@
 
     x: list[int]
 
-    reveal_type(zero)  # N: Revealed type is "def [T] (arg: builtins.list[T`-1]) -> T`-1"
-    reveal_type(zero(x))  # N: Revealed type is "builtins.int"
+    reveal_type(zero)  # N: Revealed type is "def [T] (arg: list[T]) -> T"
+    reveal_type(zero(x))  # N: Revealed type is "int"
 
 
 - case: curry_two_generic_args1
@@ -30,10 +30,10 @@
 
     x: list[int]
 
-    reveal_type(zero)  # N: Revealed type is "Overload(def [T] (arg: builtins.list[T`-1]) -> def (other: builtins.int) -> T`-1, def [T] (arg: builtins.list[T`-1], other: builtins.int) -> T`-1)"
-    reveal_type(zero(x))  # N: Revealed type is "def (other: builtins.int) -> builtins.int"
-    reveal_type(zero(x)(1))  # N: Revealed type is "builtins.int"
-    reveal_type(zero(x, 1))  # N: Revealed type is "builtins.int"
+    reveal_type(zero)  # N: Revealed type is "Overload(def [T] (arg: list[T]) -> def (other: int) -> T, def [T] (arg: list[T], other: int) -> T)"
+    reveal_type(zero(x))  # N: Revealed type is "def (other: int) -> int"
+    reveal_type(zero(x)(1))  # N: Revealed type is "int"
+    reveal_type(zero(x, 1))  # N: Revealed type is "int"
 
 
 - case: curry_two_generic_args2
@@ -51,10 +51,10 @@
     x: list[int]
     y: list[str]
 
-    reveal_type(zero(1)(x))  # N: Revealed type is "builtins.int"
-    reveal_type(zero(1, x))  # N: Revealed type is "builtins.int"
-    reveal_type(zero(1)(y))  # N: Revealed type is "builtins.str"
-    reveal_type(zero(1, y))  # N: Revealed type is "builtins.str"
+    reveal_type(zero(1)(x))  # N: Revealed type is "int"
+    reveal_type(zero(1, x))  # N: Revealed type is "int"
+    reveal_type(zero(1)(y))  # N: Revealed type is "str"
+    reveal_type(zero(1, y))  # N: Revealed type is "str"
 
 
 - case: curry_two_generic_args3
@@ -72,7 +72,7 @@
 
     x: list[int]
 
-    reveal_type(zero)  # N: Revealed type is "Overload(def [T] (arg: T`-1) -> def [T] (other: builtins.list[T`-1]) -> T`-1, def [T] (arg: T`-1, other: builtins.list[T`-1]) -> T`-1)"
-    reveal_type(zero(1))  # N: Revealed type is "def [T] (other: builtins.list[T`2]) -> T`2"
-    reveal_type(zero(1)(x))  # N: Revealed type is "builtins.int"
-    reveal_type(zero(1, x))  # N: Revealed type is "builtins.int"
+    reveal_type(zero)  # N: Revealed type is "Overload(def [T] (arg: T) -> def [T] (other: list[T]) -> T, def [T] (arg: T, other: list[T]) -> T)"
+    reveal_type(zero(1))  # N: Revealed type is "def [T] (other: list[T]) -> T"
+    reveal_type(zero(1)(x))  # N: Revealed type is "int"
+    reveal_type(zero(1, x))  # N: Revealed type is "int"
diff --git a/typesafety/test_curry/test_partial/test_partial.yml b/typesafety/test_curry/test_partial/test_partial.yml
index 34cd4aa8b..9a7fa4306 100644
--- a/typesafety/test_curry/test_partial/test_partial.yml
+++ b/typesafety/test_curry/test_partial/test_partial.yml
@@ -6,7 +6,7 @@
     def two_args(first: int, second: float) -> str:
         ...
 
-    reveal_type(partial(two_args))  # N: Revealed type is "def (first: builtins.int, second: builtins.float) -> builtins.str"
+    reveal_type(partial(two_args))  # N: Revealed type is "def (first: int, second: float) -> str"
 
 
 - case: partial_single_arg
@@ -17,7 +17,7 @@
     def two_args(first: int, second: float) -> str:
         ...
 
-    reveal_type(partial(two_args, 1))  # N: Revealed type is "def (second: builtins.float) -> builtins.str"
+    reveal_type(partial(two_args, 1))  # N: Revealed type is "def (second: float) -> str"
 
 
 - case: partial_all_args
@@ -28,7 +28,7 @@
     def two_args(first: int, second: float) -> str:
         ...
 
-    reveal_type(partial(two_args, 1, second=0.5))  # N: Revealed type is "def () -> builtins.str"
+    reveal_type(partial(two_args, 1, second=0.5))  # N: Revealed type is "def () -> str"
 
 
 - case: partial_single_named_arg
@@ -39,7 +39,7 @@
     def two_args(first: int, second: float) -> str:
         ...
 
-    reveal_type(partial(two_args, second=1.0))  # N: Revealed type is "def (first: builtins.int) -> builtins.str"
+    reveal_type(partial(two_args, second=1.0))  # N: Revealed type is "def (first: int) -> str"
 
 
 - case: partial_multiple_args
@@ -57,7 +57,7 @@
     ) -> str:
         ...
 
-    reveal_type(partial(multiple, 1, 0.4, flag3=int, flag2=True))  # N: Revealed type is "def (third: builtins.str, flag1: builtins.bool) -> builtins.str"
+    reveal_type(partial(multiple, 1, 0.4, flag3=int, flag2=True))  # N: Revealed type is "def (third: str, flag1: bool) -> str"
 
 
 - case: partial_not_callable_type
@@ -67,7 +67,7 @@
 
     curried_int = partial(int, 10)
 
-    reveal_type(curried_int)  # N: Revealed type is "def () -> builtins.int"
+    reveal_type(curried_int)  # N: Revealed type is "def () -> int"
 
 
 - case: partial_explicit_noreturn
@@ -132,7 +132,6 @@
 
     partial(multiple, missing=1)
   out: |
-    main:4: note: "multiple" defined here
     main:10: error: Unexpected keyword argument "missing" for "multiple"  [call-arg]
 
 
@@ -149,4 +148,4 @@
         default: _SecondType,
         function: Callable[[_SecondType, _FirstType], _SecondType],
     ):
-        reveal_type(partial(function, default))  # N: Revealed type is "def (_FirstType`-2) -> _SecondType`-1"
+        reveal_type(partial(function, default))  # N: Revealed type is "def (_FirstType) -> _SecondType"
diff --git a/typesafety/test_curry/test_partial/test_partial_arguments.yml b/typesafety/test_curry/test_partial/test_partial_arguments.yml
index 391d49065..f3342efe5 100644
--- a/typesafety/test_curry/test_partial/test_partial_arguments.yml
+++ b/typesafety/test_curry/test_partial/test_partial_arguments.yml
@@ -25,16 +25,16 @@
     reveal_type(partial(multiple, 1, 2, 3, 4.0, 5.0))
     reveal_type(partial(multiple, 1, 2, 3, m='m', q='q', long='long'))
   out: |
-    main:14: note: Revealed type is "def (a: builtins.int, b: builtins.int, c: builtins.int =, *args: builtins.float, d: builtins.str, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
-    main:15: note: Revealed type is "def (b: builtins.int, c: builtins.int =, *args: builtins.float, d: builtins.str, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
-    main:16: note: Revealed type is "def (c: builtins.int =, *args: builtins.float, d: builtins.str, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
-    main:17: note: Revealed type is "def (*args: builtins.float, d: builtins.str, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
-    main:18: note: Revealed type is "def (*args: builtins.float, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
-    main:19: note: Revealed type is "def (*args: builtins.float, d: builtins.str, **kwargs: builtins.str) -> builtins.str"
-    main:20: note: Revealed type is "def (c: builtins.int =, *args: builtins.float, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
-    main:21: note: Revealed type is "def (c: builtins.int =, *args: builtins.float, d: builtins.str, **kwargs: builtins.str) -> builtins.str"
-    main:22: note: Revealed type is "def (*args: builtins.float, d: builtins.str, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
-    main:23: note: Revealed type is "def (*args: builtins.float, d: builtins.str, e: builtins.bool =, **kwargs: builtins.str) -> builtins.str"
+    main:14: note: Revealed type is "def (a: int, b: int, c: int =, *args: float, d: str, e: bool =, **kwargs: str) -> str"
+    main:15: note: Revealed type is "def (b: int, c: int =, *args: float, d: str, e: bool =, **kwargs: str) -> str"
+    main:16: note: Revealed type is "def (c: int =, *args: float, d: str, e: bool =, **kwargs: str) -> str"
+    main:17: note: Revealed type is "def (*args: float, d: str, e: bool =, **kwargs: str) -> str"
+    main:18: note: Revealed type is "def (*args: float, e: bool =, **kwargs: str) -> str"
+    main:19: note: Revealed type is "def (*args: float, d: str, **kwargs: str) -> str"
+    main:20: note: Revealed type is "def (c: int =, *args: float, e: bool =, **kwargs: str) -> str"
+    main:21: note: Revealed type is "def (c: int =, *args: float, d: str, **kwargs: str) -> str"
+    main:22: note: Revealed type is "def (*args: float, d: str, e: bool =, **kwargs: str) -> str"
+    main:23: note: Revealed type is "def (*args: float, d: str, e: bool =, **kwargs: str) -> str"
 
 
 - case: partial_args_kwargs
@@ -48,7 +48,7 @@
     ) -> str:
         ...
 
-    reveal_type(partial(multiple, 1, 2, 3, x='x', y='y')(4, 5, z='z'))  # N: Revealed type is "builtins.str"
+    reveal_type(partial(multiple, 1, 2, 3, x='x', y='y')(4, 5, z='z'))  # N: Revealed type is "str"
 
 
 - case: partial_pos_only_args
@@ -65,11 +65,11 @@
     ) -> str:
         ...
 
-    reveal_type(partial(multiple, 1))  # N: Revealed type is "def (builtins.int, builtins.int, d: builtins.int) -> builtins.str"
-    reveal_type(partial(multiple, 1, 2))  # N: Revealed type is "def (builtins.int, d: builtins.int) -> builtins.str"
-    reveal_type(partial(multiple, 1, 2, 3))  # N: Revealed type is "def (d: builtins.int) -> builtins.str"
-    reveal_type(partial(multiple, 1, 2, d=4))  # N: Revealed type is "def (builtins.int) -> builtins.str"
-    reveal_type(partial(multiple, 1, 2, 3, d=4))  # N: Revealed type is "def () -> builtins.str"
+    reveal_type(partial(multiple, 1))  # N: Revealed type is "def (int, int, d: int) -> str"
+    reveal_type(partial(multiple, 1, 2))  # N: Revealed type is "def (int, d: int) -> str"
+    reveal_type(partial(multiple, 1, 2, 3))  # N: Revealed type is "def (d: int) -> str"
+    reveal_type(partial(multiple, 1, 2, d=4))  # N: Revealed type is "def (int) -> str"
+    reveal_type(partial(multiple, 1, 2, 3, d=4))  # N: Revealed type is "def () -> str"
 
 
 - case: partial_object
@@ -89,10 +89,10 @@
     reveal_type(partial(Inst(1)))
     reveal_type(partial(Inst(1), 1))
   out: |
-    main:10: note: Revealed type is "def (arg: builtins.int) -> main.Inst"
+    main:10: note: Revealed type is "def (arg: int) -> main.Inst"
     main:11: note: Revealed type is "def () -> main.Inst"
     main:12: note: Revealed type is "main.Inst"
-    main:13: note: Revealed type is "def () -> builtins.int"
+    main:13: note: Revealed type is "def () -> int"
 
 
 - case: partial_classmethod
@@ -105,7 +105,7 @@
         def some(cls, arg: int, other: str) -> float:
             ...
 
-    reveal_type(partial(Test.some, 1))  # N: Revealed type is "def (other: builtins.str) -> builtins.float"
+    reveal_type(partial(Test.some, 1))  # N: Revealed type is "def (other: str) -> float"
 
 
 - case: partial_staticmethod
@@ -118,7 +118,7 @@
         def some(arg: int, other: str) -> float:
             ...
 
-    reveal_type(partial(Test.some, 1))  # N: Revealed type is "def (other: builtins.str) -> builtins.float"
+    reveal_type(partial(Test.some, 1))  # N: Revealed type is "def (other: str) -> float"
 
 
 - case: partial_union
@@ -178,8 +178,8 @@
 
     def receives_type(a: int, t: Type[I]) -> I:
         x = partial(t, a)
-        reveal_type(x)  # N: Revealed type is "def () -> I`-1"
-        reveal_type(x().arg)  # N: Revealed type is "builtins.int"
+        reveal_type(x)  # N: Revealed type is "def () -> I"
+        reveal_type(x().arg)  # N: Revealed type is "int"
         return t(1)
 
 
@@ -191,7 +191,7 @@
     def multiple(a: int, b: int) -> int:
         ...
 
-    reveal_type(partial(multiple, *(1, 2)))  # N: Revealed type is "def (*Any, **Any) -> builtins.int"
+    reveal_type(partial(multiple, *(1, 2)))  # N: Revealed type is "def (*Any, **Any) -> int"
 
 
 - case: partial_star2_arg
@@ -202,7 +202,7 @@
     def multiple(a: int, b: int) -> int:
         ...
 
-    reveal_type(partial(multiple, **{'a': 1, 'b': 2}))  # N: Revealed type is "def (*Any, **Any) -> builtins.int"
+    reveal_type(partial(multiple, **{'a': 1, 'b': 2}))  # N: Revealed type is "def (*Any, **Any) -> int"
 
 
 - case: partial_lambda
@@ -210,4 +210,4 @@
   main: |
     from returns.curry import partial
 
-    reveal_type(partial((lambda x, y: str(x + y)), 1))  # N: Revealed type is "def (y: Any) -> builtins.str"
+    reveal_type(partial((lambda x, y: str(x + y)), 1))  # N: Revealed type is "def (y: Any) -> str"
diff --git a/typesafety/test_curry/test_partial/test_partial_generic.yml b/typesafety/test_curry/test_partial/test_partial_generic.yml
index 7437c1feb..64aeb57b3 100644
--- a/typesafety/test_curry/test_partial/test_partial_generic.yml
+++ b/typesafety/test_curry/test_partial/test_partial_generic.yml
@@ -17,7 +17,7 @@
 
     reveal_type(partial(multiple, x)(y))
   out: |
-    main:15: note: Revealed type is "builtins.int"
+    main:15: note: Revealed type is "int"
     main:15: error: Argument 1 to "multiple" has incompatible type "list[str]"; expected "list[int]"  [arg-type]
 
 
@@ -40,7 +40,7 @@
 
     reveal_type(partial(multiple, x)(y))
   out: |
-    main:15: note: Revealed type is "builtins.int"
+    main:15: note: Revealed type is "int"
 
 
 - case: partial_single_generic
@@ -69,14 +69,14 @@
     reveal_type(partial(multiple, 2, x, True))
     reveal_type(partial(multiple, 2, x)())
   out: |
-    main:15: note: Revealed type is "def [T] (a: builtins.int, b: builtins.list[T`-1], c: builtins.bool =) -> T`-1"
-    main:16: note: Revealed type is "def [T] (b: builtins.list[T`-1], c: builtins.bool =) -> T`-1"
-    main:17: note: Revealed type is "builtins.int"
-    main:18: note: Revealed type is "builtins.int"
-    main:19: note: Revealed type is "builtins.int"
-    main:20: note: Revealed type is "def (c: builtins.bool =) -> builtins.int"
-    main:21: note: Revealed type is "def () -> builtins.int"
-    main:22: note: Revealed type is "builtins.int"
+    main:15: note: Revealed type is "def [T] (a: int, b: list[T], c: bool =) -> T"
+    main:16: note: Revealed type is "def [T] (b: list[T], c: bool =) -> T"
+    main:17: note: Revealed type is "int"
+    main:18: note: Revealed type is "int"
+    main:19: note: Revealed type is "int"
+    main:20: note: Revealed type is "def (c: bool =) -> int"
+    main:21: note: Revealed type is "def () -> int"
+    main:22: note: Revealed type is "int"
 
 
 - case: partial_double_generic_complex38
@@ -106,12 +106,12 @@
     reveal_type(partial(multiple, 1, b=y))
     reveal_type(partial(multiple, 1, c=y))
   out: |
-    main:18: note: Revealed type is "def [B, A] (a: builtins.int, *, b: builtins.list[B`-1], c: builtins.list[A`-2]) -> A`-2 | B`-1"
-    main:19: note: Revealed type is "def [B, A] (*, b: builtins.list[B`-1], c: builtins.list[A`-2]) -> A`-2 | B`-1"
-    main:20: note: Revealed type is "def [A] (*, c: builtins.list[A`-2]) -> A`-2 | builtins.int"
-    main:21: note: Revealed type is "def [B] (*, b: builtins.list[B`-1]) -> builtins.int | B`-1"
-    main:22: note: Revealed type is "def [A] (*, c: builtins.list[A`-2]) -> A`-2 | builtins.str"
-    main:23: note: Revealed type is "def [B] (*, b: builtins.list[B`-1]) -> builtins.str | B`-1"
+    main:18: note: Revealed type is "def [B, A] (a: int, *, b: list[B], c: list[A]) -> A | B"
+    main:19: note: Revealed type is "def [B, A] (*, b: list[B], c: list[A]) -> A | B"
+    main:20: note: Revealed type is "def [A] (*, c: list[A]) -> A | int"
+    main:21: note: Revealed type is "def [B] (*, b: list[B]) -> int | B"
+    main:22: note: Revealed type is "def [A] (*, c: list[A]) -> A | str"
+    main:23: note: Revealed type is "def [B] (*, b: list[B]) -> str | B"
 
 
 - case: partial_double_generic
@@ -138,6 +138,6 @@
     reveal_type(partial(multiple, 1, b=x)(c=y))
     reveal_type(partial(multiple, 1, c=x)(b=y))
   out: |
-    main:17: note: Revealed type is "def () -> builtins.str | builtins.int"
-    main:19: note: Revealed type is "builtins.str | builtins.int"
-    main:20: note: Revealed type is "builtins.int | builtins.str"
+    main:17: note: Revealed type is "def () -> str | int"
+    main:19: note: Revealed type is "str | int"
+    main:20: note: Revealed type is "int | str"
diff --git a/typesafety/test_curry/test_partial/test_partial_overload.yml b/typesafety/test_curry/test_partial/test_partial_overload.yml
index 25fd828f1..41eb379d6 100644
--- a/typesafety/test_curry/test_partial/test_partial_overload.yml
+++ b/typesafety/test_curry/test_partial/test_partial_overload.yml
@@ -21,7 +21,7 @@
     main:15: note: Possible overload variants:
     main:15: note:     def two_args(a, a: int) -> int
     main:15: note:     def two_args(a, a: str) -> str
-    main:15: note: Revealed type is "def (*Any, **Any) -> builtins.int"
+    main:15: note: Revealed type is "def (*Any, **Any) -> int"
 
 
 - case: partial_wrong_overload2
@@ -77,11 +77,11 @@
     reveal_type(partial(two_args, 1, 'a'))
     reveal_type(partial(two_args, 'a'))
   out: |
-    main:19: note: Revealed type is "Overload(def (a: builtins.int, b: builtins.int) -> builtins.int, def (a: builtins.int, b: builtins.str) -> builtins.str, def (a: builtins.str, b: builtins.str) -> builtins.str)"
-    main:20: note: Revealed type is "Overload(def (b: builtins.int) -> builtins.int, def (b: builtins.str) -> builtins.str)"
-    main:21: note: Revealed type is "def () -> builtins.int"
-    main:22: note: Revealed type is "def () -> builtins.str"
-    main:23: note: Revealed type is "def (b: builtins.str) -> builtins.str"
+    main:19: note: Revealed type is "Overload(def (a: int, b: int) -> int, def (a: int, b: str) -> str, def (a: str, b: str) -> str)"
+    main:20: note: Revealed type is "Overload(def (b: int) -> int, def (b: str) -> str)"
+    main:21: note: Revealed type is "def () -> int"
+    main:22: note: Revealed type is "def () -> str"
+    main:23: note: Revealed type is "def (b: str) -> str"
 
 
 - case: partial_generic_overload_kind1
@@ -117,12 +117,12 @@
     reveal_type(partial(two_args, x))
     reveal_type(partial(two_args, x, y))
   out: |
-    main:24: note: Revealed type is "Overload(def [T] (a: builtins.int, b: builtins.list[T`-1]) -> T`-1, def [T] (a: builtins.int, b: builtins.set[T`-1]) -> T`-1, def [T] (a: builtins.list[T`-1], b: builtins.set[T`-1]) -> T`-1)"
-    main:25: note: Revealed type is "Overload(def [T] (b: builtins.list[T`-1]) -> T`-1, def [T] (b: builtins.set[T`-1]) -> T`-1)"
-    main:26: note: Revealed type is "def () -> builtins.float"
-    main:27: note: Revealed type is "def () -> builtins.float"
-    main:28: note: Revealed type is "def (b: builtins.set[builtins.float]) -> builtins.float"
-    main:29: note: Revealed type is "def () -> builtins.float"
+    main:24: note: Revealed type is "Overload(def [T] (a: int, b: list[T]) -> T, def [T] (a: int, b: set[T]) -> T, def [T] (a: list[T], b: set[T]) -> T)"
+    main:25: note: Revealed type is "Overload(def [T] (b: list[T]) -> T, def [T] (b: set[T]) -> T)"
+    main:26: note: Revealed type is "def () -> float"
+    main:27: note: Revealed type is "def () -> float"
+    main:28: note: Revealed type is "def (b: set[float]) -> float"
+    main:29: note: Revealed type is "def () -> float"
 
 
 - case: partial_generic_overload_kind2
@@ -161,11 +161,11 @@
     reveal_type(partial(two_args, a, b))
     reveal_type(partial(two_args, b, a))
   out: |
-    main:25: note: Revealed type is "Overload(def [A] (a: builtins.int, b: builtins.list[A`-1]) -> A`-1, def [B] (a: builtins.int, b: builtins.list[B`-1]) -> B`-1, def [A, B] (a: builtins.list[A`-1], b: builtins.list[B`-2]) -> A`-1 | B`-2)"
-    main:26: note: Revealed type is "Overload(def [A] (b: builtins.list[A`-1]) -> A`-1, def [B] (b: builtins.list[B`-1]) -> B`-1)"
-    main:27: note: Revealed type is "Overload(def () -> builtins.float, def () -> builtins.float)"
-    main:28: note: Revealed type is "Overload(def () -> builtins.str, def () -> builtins.str)"
-    main:29: note: Revealed type is "def [B] (b: builtins.list[B`-2]) -> builtins.float | B`-2"
-    main:30: note: Revealed type is "def [B] (b: builtins.list[B`-2]) -> builtins.str | B`-2"
-    main:31: note: Revealed type is "def () -> builtins.float | builtins.str"
-    main:32: note: Revealed type is "def () -> builtins.str | builtins.float"
+    main:25: note: Revealed type is "Overload(def [A] (a: int, b: list[A]) -> A, def [B] (a: int, b: list[B]) -> B, def [A, B] (a: list[A], b: list[B]) -> A | B)"
+    main:26: note: Revealed type is "Overload(def [A] (b: list[A]) -> A, def [B] (b: list[B]) -> B)"
+    main:27: note: Revealed type is "Overload(def () -> float, def () -> float)"
+    main:28: note: Revealed type is "Overload(def () -> str, def () -> str)"
+    main:29: note: Revealed type is "def [B] (b: list[B]) -> float | B"
+    main:30: note: Revealed type is "def [B] (b: list[B]) -> str | B"
+    main:31: note: Revealed type is "def () -> float | str"
+    main:32: note: Revealed type is "def () -> str | float"
diff --git a/typesafety/test_examples/test_your_container/test_pair4_def.yml b/typesafety/test_examples/test_your_container/test_pair4_def.yml
index 98ad3dcd7..ba8f8e175 100644
--- a/typesafety/test_examples/test_your_container/test_pair4_def.yml
+++ b/typesafety/test_examples/test_your_container/test_pair4_def.yml
@@ -15,5 +15,5 @@
     my_pair: Pair[int, str] = Pair.from_paired(1, 'a')
     reveal_type(my_pair.pair(function))
   out: |
-    main:4: note: Revealed type is "def [_FirstType, _SecondType] (inner_value: tuple[_FirstType`1, _SecondType`2]) -> test_pair4.Pair[_FirstType`1, _SecondType`2]"
-    main:10: note: Revealed type is "test_pair4.Pair[builtins.float, builtins.bool]"
+    main:4: note: Revealed type is "def [_FirstType, _SecondType] (inner_value: tuple[_FirstType, _SecondType]) -> test_pair4.Pair[_FirstType, _SecondType]"
+    main:10: note: Revealed type is "test_pair4.Pair[float, bool]"
diff --git a/typesafety/test_examples/test_your_container/test_pair4_reuse.yml b/typesafety/test_examples/test_your_container/test_pair4_reuse.yml
index 5484bffcb..3866f3891 100644
--- a/typesafety/test_examples/test_your_container/test_pair4_reuse.yml
+++ b/typesafety/test_examples/test_your_container/test_pair4_reuse.yml
@@ -11,5 +11,5 @@
     reveal_type(my_pair.map(str))
     reveal_type(map_(str)(my_pair))
   out: |
-    main:5: note: Revealed type is "test_pair4.Pair[builtins.str, builtins.int]"
-    main:6: note: Revealed type is "test_pair4.Pair[builtins.str, builtins.int]"
+    main:5: note: Revealed type is "test_pair4.Pair[str, int]"
+    main:6: note: Revealed type is "test_pair4.Pair[str, int]"
diff --git a/typesafety/test_functions/test_compose.yml b/typesafety/test_functions/test_compose.yml
index 57b48d5c5..144b21b09 100644
--- a/typesafety/test_functions/test_compose.yml
+++ b/typesafety/test_functions/test_compose.yml
@@ -9,7 +9,7 @@
     def second(num: float) -> str:
         return str(num)
 
-    reveal_type(compose(first, second))  # N: Revealed type is "def (builtins.int) -> builtins.str"
+    reveal_type(compose(first, second))  # N: Revealed type is "def (int) -> str"
 
 
 - case: compose_two_wrong_functions
@@ -39,4 +39,4 @@
     def second(num: float) -> str:
         return str(num)
 
-    reveal_type(compose(first, second))  # N: Revealed type is "def (builtins.int) -> builtins.str"
+    reveal_type(compose(first, second))  # N: Revealed type is "def (int) -> str"
diff --git a/typesafety/test_functions/test_identity.yml b/typesafety/test_functions/test_identity.yml
index 665c34d4a..fb6232a3b 100644
--- a/typesafety/test_functions/test_identity.yml
+++ b/typesafety/test_functions/test_identity.yml
@@ -3,4 +3,4 @@
   main: |
     from returns.functions import identity
 
-    reveal_type(identity(1))  # N: Revealed type is "builtins.int"
+    reveal_type(identity(1))  # N: Revealed type is "int"
diff --git a/typesafety/test_functions/test_not_.yml b/typesafety/test_functions/test_not_.yml
index 6c5fa0df9..121869b55 100644
--- a/typesafety/test_functions/test_not_.yml
+++ b/typesafety/test_functions/test_not_.yml
@@ -6,7 +6,7 @@
     def is_even(number: int) -> bool:
         return number % 2 == 0
 
-    reveal_type(not_(is_even))  # N: Revealed type is "def (number: builtins.int) -> builtins.bool"
+    reveal_type(not_(is_even))  # N: Revealed type is "def (number: int) -> bool"
 
 
 - case: function_with_two_arguments
@@ -17,4 +17,4 @@
     def number_is_in_list(number: int, list_: list[int]) -> bool:
         return number in list_
 
-    reveal_type(not_(number_is_in_list))  # N: Revealed type is "def (number: builtins.int, list_: builtins.list[builtins.int]) -> builtins.bool"
+    reveal_type(not_(number_is_in_list))  # N: Revealed type is "def (number: int, list_: list[int]) -> bool"
diff --git a/typesafety/test_functions/test_tap.yml b/typesafety/test_functions/test_tap.yml
index 31d3f42ac..f1001edfc 100644
--- a/typesafety/test_functions/test_tap.yml
+++ b/typesafety/test_functions/test_tap.yml
@@ -6,7 +6,7 @@
     def first(num: int) -> float:
         return float(num)
 
-    reveal_type(tap(first))  # N: Revealed type is "def (builtins.int) -> builtins.int"
+    reveal_type(tap(first))  # N: Revealed type is "def (int) -> int"
 
 
 - case: untap_single_function
@@ -17,5 +17,5 @@
     def first(num: int) -> float:
         return float(num)
 
-    reveal_type(untap(first))  # N: Revealed type is "def (builtins.int)"
+    reveal_type(untap(first))  # N: Revealed type is "def (int)"
     reveal_type(untap(first)(1))  # N: Revealed type is "None"
diff --git a/typesafety/test_future/test_future_container/test_asyncify_decorator.yml b/typesafety/test_future/test_future_container/test_asyncify_decorator.yml
index 87b9328dd..c0b9d76c2 100644
--- a/typesafety/test_future/test_future_container/test_asyncify_decorator.yml
+++ b/typesafety/test_future/test_future_container/test_asyncify_decorator.yml
@@ -10,4 +10,4 @@
     ) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> typing.Coroutine[Any, Any, builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> typing.Coroutine[Any, Any, int]"
diff --git a/typesafety/test_future/test_future_container/test_do.yml b/typesafety/test_future/test_future_container/test_do.yml
index 15c873c2c..dbbaa7588 100644
--- a/typesafety/test_future/test_future_container/test_do.yml
+++ b/typesafety/test_future/test_future_container/test_do.yml
@@ -20,7 +20,7 @@
 
     Future.do(
         x + y
-        async for x in FutureSuccess(1)  # E: Invalid type supplied in do-notation: expected "returns.future.Future[Any]", got "returns.future.FutureResult[builtins.int, Any]"  [misc]
+        async for x in FutureSuccess(1)  # E: Invalid type supplied in do-notation: expected "returns.future.Future[Any]", got "returns.future.FutureResult[int, Any]"  [misc]
         async for y in Future.from_value(2.5)
     )
 
diff --git a/typesafety/test_future/test_future_container/test_future_base.yml b/typesafety/test_future/test_future_container/test_future_base.yml
index 14cfa77f7..0044002dc 100644
--- a/typesafety/test_future/test_future_container/test_future_base.yml
+++ b/typesafety/test_future/test_future_container/test_future_base.yml
@@ -6,8 +6,8 @@
     async def test() -> int:
         ...
 
-    reveal_type(Future(test()))  # N: Revealed type is "returns.future.Future[builtins.int]"
-    reveal_type(Future.from_value(1))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(Future(test()))  # N: Revealed type is "returns.future.Future[int]"
+    reveal_type(Future.from_value(1))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: future_awaitable
@@ -16,8 +16,8 @@
     from returns.future import Future
 
     async def main() -> None:
-        reveal_type(await Future.from_value(1))  # N: Revealed type is "returns.io.IO[builtins.int]"
-        reveal_type(await Future.from_value(1).awaitable())  # N: Revealed type is "returns.io.IO[builtins.int]"
+        reveal_type(await Future.from_value(1))  # N: Revealed type is "returns.io.IO[int]"
+        reveal_type(await Future.from_value(1).awaitable())  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: future_bind
@@ -28,7 +28,7 @@
     def bind_future(arg: int) -> Future[str]:
         ...
 
-    reveal_type(Future.from_value(1).bind(bind_future))  # N: Revealed type is "returns.future.Future[builtins.str]"
+    reveal_type(Future.from_value(1).bind(bind_future))  # N: Revealed type is "returns.future.Future[str]"
 
 
 - case: future_bind_awaitable
@@ -39,7 +39,7 @@
     async def bind_awaitable(arg: int) -> str:
         ...
 
-    reveal_type(Future.from_value(1).bind_awaitable(bind_awaitable))  # N: Revealed type is "returns.future.Future[builtins.str]"
+    reveal_type(Future.from_value(1).bind_awaitable(bind_awaitable))  # N: Revealed type is "returns.future.Future[str]"
 
 
 - case: future_bind_async
@@ -50,7 +50,7 @@
     async def bind_async(arg: int) -> Future[str]:
         ...
 
-    reveal_type(Future.from_value(1).bind_async(bind_async))  # N: Revealed type is "returns.future.Future[builtins.str]"
+    reveal_type(Future.from_value(1).bind_async(bind_async))  # N: Revealed type is "returns.future.Future[str]"
 
 
 - case: future_map
@@ -58,7 +58,7 @@
   main: |
     from returns.future import Future
 
-    reveal_type(Future.from_value(1).map(str))  # N: Revealed type is "returns.future.Future[builtins.str]"
+    reveal_type(Future.from_value(1).map(str))  # N: Revealed type is "returns.future.Future[str]"
 
 
 - case: future_apply
@@ -69,4 +69,4 @@
     def transform(arg: int) -> str:
         ...
 
-    reveal_type(Future.from_value(1).apply(Future.from_value(transform)))  # N: Revealed type is "returns.future.Future[builtins.str]"
+    reveal_type(Future.from_value(1).apply(Future.from_value(transform)))  # N: Revealed type is "returns.future.Future[str]"
diff --git a/typesafety/test_future/test_future_container/test_future_decorator.yml b/typesafety/test_future/test_future_container/test_future_decorator.yml
index 6cbd417c7..fce4d5ac6 100644
--- a/typesafety/test_future/test_future_container/test_future_decorator.yml
+++ b/typesafety/test_future/test_future_container/test_future_decorator.yml
@@ -10,7 +10,7 @@
     ) -> int:
         ...
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.future.Future[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.future.Future[int]"
 
 
 - case: future_composition
@@ -21,4 +21,4 @@
     async def test(first: int) -> str:
         ...
 
-    reveal_type(future(test))  # N: Revealed type is "def (first: builtins.int) -> returns.future.Future[builtins.str]"
+    reveal_type(future(test))  # N: Revealed type is "def (first: int) -> returns.future.Future[str]"
diff --git a/typesafety/test_future/test_future_container/test_future_typecast.yml b/typesafety/test_future/test_future_container/test_future_typecast.yml
index f7947c5ab..e2c46eee3 100644
--- a/typesafety/test_future/test_future_container/test_future_typecast.yml
+++ b/typesafety/test_future/test_future_container/test_future_typecast.yml
@@ -5,7 +5,7 @@
 
     first: Future[ValueError]
     second: Future[Exception] = first
-    reveal_type(second)  # N: Revealed type is "returns.future.Future[builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.future.Future[Exception]"
 
 
 - case: future_from_value
@@ -13,7 +13,7 @@
   main: |
     from returns.future import Future
 
-    reveal_type(Future.from_value(1))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(Future.from_value(1))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: future_from_io
@@ -22,7 +22,7 @@
     from returns.future import Future
     from returns.io import IO
 
-    reveal_type(Future.from_io(IO(1)))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(Future.from_io(IO(1)))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: future_from_downcast
@@ -31,4 +31,4 @@
     from returns.future import Future, FutureResult
 
     first: FutureResult[int, ValueError]
-    reveal_type(Future.from_future_result(first))  # N: Revealed type is "returns.future.Future[returns.result.Result[builtins.int, builtins.ValueError]]"
+    reveal_type(Future.from_future_result(first))  # N: Revealed type is "returns.future.Future[returns.result.Result[int, ValueError]]"
diff --git a/typesafety/test_future/test_future_result_container/test_do.yml b/typesafety/test_future/test_future_result_container/test_do.yml
index 599cd06b1..0d728b2b3 100644
--- a/typesafety/test_future/test_future_result_container/test_do.yml
+++ b/typesafety/test_future/test_future_result_container/test_do.yml
@@ -18,7 +18,7 @@
   main: |
     from returns.future import FutureResult, FutureFailure
 
-    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[Any, builtins.int | builtins.str]"
+    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[Any, int | str]"
         first / second
         async for first in FutureFailure(1)
         async for second in FutureFailure('a')
@@ -30,7 +30,7 @@
   main: |
     from returns.future import FutureSuccess, FutureResult
 
-    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[builtins.float, Never]"
+    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[float, Never]"
         x + y
         async for x in FutureSuccess(1)
         async for y in FutureSuccess(2.5)
@@ -45,7 +45,7 @@
     a: FutureResult[int, str]
     b: FutureResult[float, bytes]
 
-    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str | builtins.bytes]"
+    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[float, str | bytes]"
         x + y
         async for x in a
         async for y in b
@@ -59,7 +59,7 @@
 
     FutureResult.do(
         x + y
-        async for x in Future.from_value(1)  # E: Invalid type supplied in do-notation: expected "returns.future.FutureResult[Any, Any]", got "returns.future.Future[builtins.int]"  [misc]
+        async for x in Future.from_value(1)  # E: Invalid type supplied in do-notation: expected "returns.future.FutureResult[Any, Any]", got "returns.future.Future[int]"  [misc]
         async for y in FutureSuccess(2.5)
     )
 
@@ -72,7 +72,7 @@
 
     a: Result[int, str]
 
-    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(FutureResult.do(  # N: Revealed type is "returns.future.FutureResult[float, str]"
         x + y
         async for x in FutureResult.from_result(a)
         async for y in FutureSuccess(2.5)
diff --git a/typesafety/test_future/test_future_result_container/test_future_result_base.yml b/typesafety/test_future/test_future_result_container/test_future_result_base.yml
index 436d369de..faecf5f0b 100644
--- a/typesafety/test_future/test_future_result_container/test_future_result_base.yml
+++ b/typesafety/test_future/test_future_result_container/test_future_result_base.yml
@@ -4,10 +4,10 @@
     from returns.future import FutureResult
 
     async def main() -> None:
-        reveal_type(await FutureResult.from_value(1))  # N: Revealed type is "returns.io.IOResult[builtins.int, Any]"
-        reveal_type(await FutureResult.from_value(1).awaitable())  # N: Revealed type is "returns.io.IOResult[builtins.int, Any]"
-        reveal_type(await FutureResult.from_failure(1))  # N: Revealed type is "returns.io.IOResult[Any, builtins.int]"
-        reveal_type(await FutureResult.from_failure(1).awaitable())  # N: Revealed type is "returns.io.IOResult[Any, builtins.int]"
+        reveal_type(await FutureResult.from_value(1))  # N: Revealed type is "returns.io.IOResult[int, Any]"
+        reveal_type(await FutureResult.from_value(1).awaitable())  # N: Revealed type is "returns.io.IOResult[int, Any]"
+        reveal_type(await FutureResult.from_failure(1))  # N: Revealed type is "returns.io.IOResult[Any, int]"
+        reveal_type(await FutureResult.from_failure(1).awaitable())  # N: Revealed type is "returns.io.IOResult[Any, int]"
 
 
 - case: future_result_swap
@@ -16,7 +16,7 @@
     from returns.future import FutureResult
 
     x: FutureResult[int, str]
-    reveal_type(x.swap())  # N: Revealed type is "returns.future.FutureResult[builtins.str, builtins.int]"
+    reveal_type(x.swap())  # N: Revealed type is "returns.future.FutureResult[str, int]"
 
 
 - case: future_result_bind
@@ -29,7 +29,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.bind(bind))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.bind(bind))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_bind_awaitable
@@ -42,7 +42,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.bind_awaitable(bind_awaitable))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.bind_awaitable(bind_awaitable))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_bind_async
@@ -55,7 +55,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.bind_async(bind_async))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.bind_async(bind_async))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_bind_result
@@ -69,7 +69,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.bind_result(bind))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.bind_result(bind))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_bind_ioresult
@@ -83,7 +83,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.bind_ioresult(bind))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.bind_ioresult(bind))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_bind_future
@@ -96,7 +96,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.bind_future(bind_future))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.bind_future(bind_future))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_bind_async_future
@@ -109,7 +109,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.bind_async_future(bind_future))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.bind_async_future(bind_future))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_map
@@ -119,7 +119,7 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.map(float))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.map(float))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_apply
@@ -131,7 +131,7 @@
     first: FutureResult[int, str]
     second: FutureResult[Callable[[int], float], str]
 
-    reveal_type(first.apply(second))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(first.apply(second))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: future_result_alt
@@ -141,7 +141,7 @@
 
     first: FutureResult[int, int]
 
-    reveal_type(first.alt(float))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.float]"
+    reveal_type(first.alt(float))  # N: Revealed type is "returns.future.FutureResult[int, float]"
 
 
 - case: future_result_lash
@@ -154,4 +154,4 @@
 
     first: FutureResult[int, str]
 
-    reveal_type(first.lash(bind))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.float]"
+    reveal_type(first.lash(bind))  # N: Revealed type is "returns.future.FutureResult[int, float]"
diff --git a/typesafety/test_future/test_future_result_container/test_future_result_typecast.yml b/typesafety/test_future/test_future_result_container/test_future_result_typecast.yml
index 7ae2cd7a3..701e72574 100644
--- a/typesafety/test_future/test_future_result_container/test_future_result_typecast.yml
+++ b/typesafety/test_future/test_future_result_container/test_future_result_typecast.yml
@@ -9,8 +9,8 @@
     test1: FutureResultE[int] = first
     test2: FutureResult[int, Exception] = second
 
-    reveal_type(first)  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.Exception]"
-    reveal_type(second)  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.future.FutureResult[int, Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.future.FutureResult[int, Exception]"
 
 
 - case: future_result_covariant_cast
@@ -20,7 +20,7 @@
 
     first: FutureResult[TypeError, ValueError]  # we cast both values
     second: FutureResult[Exception, Exception] = first
-    reveal_type(second)  # N: Revealed type is "returns.future.FutureResult[builtins.Exception, builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.future.FutureResult[Exception, Exception]"
 
 
 - case: future_result_from_typecast
@@ -31,7 +31,7 @@
 
     first: Result[int, str]
 
-    reveal_type(FutureResult.from_typecast(Future.from_value(first)))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(FutureResult.from_typecast(Future.from_value(first)))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: future_result_constructor
@@ -43,9 +43,9 @@
     async def test() -> Result[int, str]:
         ...
 
-    reveal_type(FutureResult(test()))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
-    reveal_type(FutureResult.from_value(1))  # N: Revealed type is "returns.future.FutureResult[builtins.int, Any]"
-    reveal_type(FutureResult.from_failure(1))  # N: Revealed type is "returns.future.FutureResult[Any, builtins.int]"
+    reveal_type(FutureResult(test()))  # N: Revealed type is "returns.future.FutureResult[int, str]"
+    reveal_type(FutureResult.from_value(1))  # N: Revealed type is "returns.future.FutureResult[int, Any]"
+    reveal_type(FutureResult.from_failure(1))  # N: Revealed type is "returns.future.FutureResult[Any, int]"
 
 
 - case: future_result_unit_functions
@@ -53,8 +53,8 @@
   main: |
     from returns.future import FutureSuccess, FutureFailure
 
-    reveal_type(FutureSuccess(1))  # N: Revealed type is "returns.future.FutureResult[builtins.int, Any]"
-    reveal_type(FutureFailure(1))  # N: Revealed type is "returns.future.FutureResult[Any, builtins.int]"
+    reveal_type(FutureSuccess(1))  # N: Revealed type is "returns.future.FutureResult[int, Any]"
+    reveal_type(FutureFailure(1))  # N: Revealed type is "returns.future.FutureResult[Any, int]"
 
 
 - case: future_result_from_result
@@ -63,8 +63,8 @@
     from returns.future import FutureResult
     from returns.result import Result, Success, Failure
 
-    reveal_type(FutureResult.from_result(Success(1)))  # N: Revealed type is "returns.future.FutureResult[builtins.int, Any]"
-    reveal_type(FutureResult.from_result(Failure(1)))  # N: Revealed type is "returns.future.FutureResult[Any, builtins.int]"
+    reveal_type(FutureResult.from_result(Success(1)))  # N: Revealed type is "returns.future.FutureResult[int, Any]"
+    reveal_type(FutureResult.from_result(Failure(1)))  # N: Revealed type is "returns.future.FutureResult[Any, int]"
 
 
 - case: future_result_from_io
@@ -73,10 +73,10 @@
     from returns.future import FutureResult
     from returns.io import IO, IOSuccess, IOFailure
 
-    reveal_type(FutureResult.from_ioresult(IOSuccess(1)))  # N: Revealed type is "returns.future.FutureResult[builtins.int, Any]"
-    reveal_type(FutureResult.from_ioresult(IOFailure(1)))  # N: Revealed type is "returns.future.FutureResult[Any, builtins.int]"
-    reveal_type(FutureResult.from_io(IO(1)))  # N: Revealed type is "returns.future.FutureResult[builtins.int, Any]"
-    reveal_type(FutureResult.from_failed_io(IO(1)))  # N: Revealed type is "returns.future.FutureResult[Any, builtins.int]"
+    reveal_type(FutureResult.from_ioresult(IOSuccess(1)))  # N: Revealed type is "returns.future.FutureResult[int, Any]"
+    reveal_type(FutureResult.from_ioresult(IOFailure(1)))  # N: Revealed type is "returns.future.FutureResult[Any, int]"
+    reveal_type(FutureResult.from_io(IO(1)))  # N: Revealed type is "returns.future.FutureResult[int, Any]"
+    reveal_type(FutureResult.from_failed_io(IO(1)))  # N: Revealed type is "returns.future.FutureResult[Any, int]"
 
 
 - case: future_result_from_future
@@ -84,5 +84,5 @@
   main: |
     from returns.future import Future, FutureResult
 
-    reveal_type(FutureResult.from_future(Future.from_value(1)))  # N: Revealed type is "returns.future.FutureResult[builtins.int, Any]"
-    reveal_type(FutureResult.from_failed_future(Future.from_value(1)))  # N: Revealed type is "returns.future.FutureResult[Any, builtins.int]"
+    reveal_type(FutureResult.from_future(Future.from_value(1)))  # N: Revealed type is "returns.future.FutureResult[int, Any]"
+    reveal_type(FutureResult.from_failed_future(Future.from_value(1)))  # N: Revealed type is "returns.future.FutureResult[Any, int]"
diff --git a/typesafety/test_future/test_future_result_container/test_future_safe_decorator.yml b/typesafety/test_future/test_future_result_container/test_future_safe_decorator.yml
index 68c268368..28c579ff0 100644
--- a/typesafety/test_future/test_future_result_container/test_future_safe_decorator.yml
+++ b/typesafety/test_future/test_future_result_container/test_future_safe_decorator.yml
@@ -10,7 +10,7 @@
     ) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.future.FutureResult[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.future.FutureResult[int, Exception]"
 
 
 - case: future_safe_composition_with_args
@@ -24,7 +24,7 @@
     ) -> int:
         return 1
 
-    reveal_type(future_safe(test))  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.future.FutureResult[builtins.int, builtins.Exception]"
+    reveal_type(future_safe(test))  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.future.FutureResult[int, Exception]"
 
 
 - case: future_safe_decorator_with_pos_params
@@ -39,7 +39,7 @@
     ) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.future.FutureResult[builtins.int, builtins.ValueError]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.future.FutureResult[int, ValueError]"
 
 
 - case: future_safe_decorator_with_named_params
@@ -54,4 +54,4 @@
     ) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.future.FutureResult[builtins.int, builtins.ValueError]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.future.FutureResult[int, ValueError]"
diff --git a/typesafety/test_interfaces/test_altable/test_inheritance.yml b/typesafety/test_interfaces/test_altable/test_inheritance.yml
index ed4a39384..15ec56899 100644
--- a/typesafety/test_interfaces/test_altable/test_inheritance.yml
+++ b/typesafety/test_interfaces/test_altable/test_inheritance.yml
@@ -23,7 +23,7 @@
     def test(arg: str) -> int:
         ...
 
-    reveal_type(MyClass(1, '1').alt(test))  # N: Revealed type is "main.MyClass[builtins.int, builtins.int]"
+    reveal_type(MyClass(1, '1').alt(test))  # N: Revealed type is "main.MyClass[int, int]"
 
 
 - case: altable_inheritance_correct3
@@ -53,7 +53,7 @@
     def test(arg: str) -> float:
         ...
 
-    reveal_type(MyClass(1, 'a', True).alt(test))  # N: Revealed type is "main.MyClass[builtins.int, builtins.float, builtins.bool]"
+    reveal_type(MyClass(1, 'a', True).alt(test))  # N: Revealed type is "main.MyClass[int, float, bool]"
 
 
 - case: altable_inheritance_missing
diff --git a/typesafety/test_interfaces/test_bindable/test_inheritance.yml b/typesafety/test_interfaces/test_bindable/test_inheritance.yml
index 78bb2ea82..11331ddd5 100644
--- a/typesafety/test_interfaces/test_bindable/test_inheritance.yml
+++ b/typesafety/test_interfaces/test_bindable/test_inheritance.yml
@@ -21,7 +21,7 @@
     def test(arg: str) -> MyClass[int]:
         ...
 
-    reveal_type(MyClass('1').bind(test))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(MyClass('1').bind(test))  # N: Revealed type is "main.MyClass[int]"
 
 
 - case: bindable_inheritance_correct2
@@ -49,7 +49,7 @@
     def test(arg: str) -> MyClass[int, str]:
         ...
 
-    reveal_type(MyClass('1', 'a').bind(test))  # N: Revealed type is "main.MyClass[builtins.int, builtins.str]"
+    reveal_type(MyClass('1', 'a').bind(test))  # N: Revealed type is "main.MyClass[int, str]"
 
 
 - case: bindable_inheritance_correct3
@@ -79,7 +79,7 @@
     def test(arg: str) -> MyClass[int, str, bool]:
         ...
 
-    reveal_type(MyClass('1', 'a', True).bind(test))  # N: Revealed type is "main.MyClass[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(MyClass('1', 'a', True).bind(test))  # N: Revealed type is "main.MyClass[int, str, bool]"
 
 
 - case: bindable_inheritance_missing
diff --git a/typesafety/test_interfaces/test_equality/test_inheritance.yml b/typesafety/test_interfaces/test_equality/test_inheritance.yml
index f30f2d2f7..a0a194ab9 100644
--- a/typesafety/test_interfaces/test_equality/test_inheritance.yml
+++ b/typesafety/test_interfaces/test_equality/test_inheritance.yml
@@ -17,8 +17,8 @@
 
         equals = container_equality
 
-    reveal_type(MyOwn(1).equals(MyOwn(1)))  # N: Revealed type is "builtins.bool"
-    reveal_type(MyOwn(1).equals(MyOwn('a')))  # N: Revealed type is "builtins.bool"
+    reveal_type(MyOwn(1).equals(MyOwn(1)))  # N: Revealed type is "bool"
+    reveal_type(MyOwn(1).equals(MyOwn('a')))  # N: Revealed type is "bool"
     MyOwn(1).equals(1)  # E: Argument 1 has incompatible type "int"; expected "KindN[MyOwn[Any], Any, Any, Any]"  [arg-type]
 
 
@@ -42,8 +42,8 @@
         def equals(self, other: MyOwn[V]) -> bool:
             ...
 
-    reveal_type(MyOwn(1).equals(MyOwn(1)))  # N: Revealed type is "builtins.bool"
-    reveal_type(MyOwn(1).equals(MyOwn('a')))  # N: Revealed type is "builtins.bool"
+    reveal_type(MyOwn(1).equals(MyOwn(1)))  # N: Revealed type is "bool"
+    reveal_type(MyOwn(1).equals(MyOwn('a')))  # N: Revealed type is "bool"
 
 
 - case: equable_inheritance_missing
diff --git a/typesafety/test_interfaces/test_failable/test_diverse_failable.yml b/typesafety/test_interfaces/test_failable/test_diverse_failable.yml
index 06bc51f28..c7cf83bd3 100644
--- a/typesafety/test_interfaces/test_failable/test_diverse_failable.yml
+++ b/typesafety/test_interfaces/test_failable/test_diverse_failable.yml
@@ -21,7 +21,7 @@
             ...
 
     x: MyClass[str, int]
-    reveal_type(MyClass.from_failure(10))  # N: Revealed type is "main.MyClass[Never, builtins.int]"
+    reveal_type(MyClass.from_failure(10))  # N: Revealed type is "main.MyClass[Never, int]"
 
 
 - case: diverse_failable_inheritance_correct3
@@ -48,7 +48,7 @@
             ...
 
     x: MyClass[float, bool, str]
-    reveal_type(MyClass.from_failure(10))  # N: Revealed type is "main.MyClass[Never, builtins.int, Never]"
+    reveal_type(MyClass.from_failure(10))  # N: Revealed type is "main.MyClass[Never, int, Never]"
 
 
 - case: diverse_failable_inheritance_missing
diff --git a/typesafety/test_interfaces/test_lashable/test_inheritance.yml b/typesafety/test_interfaces/test_lashable/test_inheritance.yml
index 459d6db84..392a2f950 100644
--- a/typesafety/test_interfaces/test_lashable/test_inheritance.yml
+++ b/typesafety/test_interfaces/test_lashable/test_inheritance.yml
@@ -23,7 +23,7 @@
     def test(arg: str) -> MyClass[int, int]:
         ...
 
-    reveal_type(MyClass(1, '1').lash(test))  # N: Revealed type is "main.MyClass[builtins.int, builtins.int]"
+    reveal_type(MyClass(1, '1').lash(test))  # N: Revealed type is "main.MyClass[int, int]"
 
 
 - case: lashable_inheritance_correct3
@@ -53,7 +53,7 @@
     def test(arg: str) -> MyClass[int, float, bool]:
         ...
 
-    reveal_type(MyClass(1, 'a', True).lash(test))  # N: Revealed type is "main.MyClass[builtins.int, builtins.float, builtins.bool]"
+    reveal_type(MyClass(1, 'a', True).lash(test))  # N: Revealed type is "main.MyClass[int, float, bool]"
 
 
 - case: lashable_inheritance_missing
diff --git a/typesafety/test_interfaces/test_mappable/test_inheritance.yml b/typesafety/test_interfaces/test_mappable/test_inheritance.yml
index ea48c5f65..a4e3b6c7d 100644
--- a/typesafety/test_interfaces/test_mappable/test_inheritance.yml
+++ b/typesafety/test_interfaces/test_mappable/test_inheritance.yml
@@ -15,7 +15,7 @@
         def map(self, function: Callable[[V], N]) -> 'MyClass[N]':
             return MyClass(function(self.value))
 
-    reveal_type(MyClass('1').map(int))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(MyClass('1').map(int))  # N: Revealed type is "main.MyClass[int]"
 
 
 - case: mappable_inheritance_correct2
@@ -37,7 +37,7 @@
         def map(self, function: Callable[[V], N]) -> 'MyClass[N, E]':
             return MyClass(function(self.value), self.error)
 
-    reveal_type(MyClass('1', 1).map(int))  # N: Revealed type is "main.MyClass[builtins.int, builtins.int]"
+    reveal_type(MyClass('1', 1).map(int))  # N: Revealed type is "main.MyClass[int, int]"
 
 
 - case: mappable_inheritance_correct3
@@ -61,7 +61,7 @@
         def map(self, function: Callable[[V], N]) -> 'MyClass[N, E, K]':
             return MyClass(function(self.value), self.error, self.last)
 
-    reveal_type(MyClass('1', 1, True).map(int))  # N: Revealed type is "main.MyClass[builtins.int, builtins.int, builtins.bool]"
+    reveal_type(MyClass('1', 1, True).map(int))  # N: Revealed type is "main.MyClass[int, int, bool]"
 
 
 - case: mappable_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_future/test_futurebased_inheritance.yml b/typesafety/test_interfaces/test_specific/test_future/test_futurebased_inheritance.yml
index 0241a08b7..61156190f 100644
--- a/typesafety/test_interfaces/test_specific/test_future/test_futurebased_inheritance.yml
+++ b/typesafety/test_interfaces/test_specific/test_future/test_futurebased_inheritance.yml
@@ -55,7 +55,7 @@
         ...
 
     x: Future[int]
-    reveal_type(MyClass.from_future(x).bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[builtins.str]"
+    reveal_type(MyClass.from_future(x).bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[str]"
 
 
 - case: future_inheritance_correct2
@@ -116,7 +116,7 @@
         ...
 
     x: MyClass[int, bool]
-    reveal_type(x.bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[builtins.str, builtins.bool]"
+    reveal_type(x.bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[str, bool]"
 
 
 - case: future_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_future/test_futurelike_inheritance.yml b/typesafety/test_interfaces/test_specific/test_future/test_futurelike_inheritance.yml
index d6a2f3e79..d61741f15 100644
--- a/typesafety/test_interfaces/test_specific/test_future/test_futurelike_inheritance.yml
+++ b/typesafety/test_interfaces/test_specific/test_future/test_futurelike_inheritance.yml
@@ -55,7 +55,7 @@
         ...
 
     x: Future[int]
-    reveal_type(MyClass.from_future(x).bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[builtins.str]"
+    reveal_type(MyClass.from_future(x).bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[str]"
 
 
 - case: future_inheritance_correct2
@@ -116,7 +116,7 @@
         ...
 
     x: MyClass[int, bool]
-    reveal_type(x.bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[builtins.str, builtins.bool]"
+    reveal_type(x.bind_future(test1).bind_async_future(test2).bind_async(test3))  # N: Revealed type is "main.MyClass[str, bool]"
 
 
 - case: future_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_based.yml b/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_based.yml
index 199d00990..0c57bfc45 100644
--- a/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_based.yml
+++ b/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_based.yml
@@ -48,7 +48,7 @@
         ...
 
     x: MyClass[int, str]
-    reveal_type(x.bind_future_result(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(x.bind_future_result(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: future_result_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_like.yml b/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_like.yml
index df3457798..a95474e74 100644
--- a/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_like.yml
+++ b/typesafety/test_interfaces/test_specific/test_future_result/test_future_result_like.yml
@@ -41,7 +41,7 @@
         ...
 
     x: MyClass[int, str]
-    reveal_type(x.bind_future_result(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(x.bind_future_result(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: future_result_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_io/test_io_like.yml b/typesafety/test_interfaces/test_specific/test_io/test_io_like.yml
index 493d88a37..30bad5231 100644
--- a/typesafety/test_interfaces/test_specific/test_io/test_io_like.yml
+++ b/typesafety/test_interfaces/test_specific/test_io/test_io_like.yml
@@ -29,7 +29,7 @@
         ...
 
     x: IO[int]
-    reveal_type(MyClass.from_io(x).bind_io(test))  # N: Revealed type is "main.MyClass[builtins.float]"
+    reveal_type(MyClass.from_io(x).bind_io(test))  # N: Revealed type is "main.MyClass[float]"
 
 
 - case: io_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultbased_inheritance.yml b/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultbased_inheritance.yml
index 9ac7017bc..388ebc10d 100644
--- a/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultbased_inheritance.yml
+++ b/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultbased_inheritance.yml
@@ -48,7 +48,7 @@
         ...
 
     x: IOResult[int, str]
-    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: ioresult_inheritance_correct3
@@ -102,7 +102,7 @@
         ...
 
     x: IOResult[int, str]
-    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str, Any]"
+    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[float, str, Any]"
 
 
 - case: ioresult_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultlike_inheritance.yml b/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultlike_inheritance.yml
index fe9963eaa..c219065cf 100644
--- a/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultlike_inheritance.yml
+++ b/typesafety/test_interfaces/test_specific/test_ioresult/test_ioresultlike_inheritance.yml
@@ -42,7 +42,7 @@
         ...
 
     x: IOResult[int, str]
-    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: ioresult_inheritance_correct3
@@ -90,7 +90,7 @@
         ...
 
     x: IOResult[int, str]
-    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str, Any]"
+    reveal_type(MyClass.from_ioresult(x).bind_ioresult(test))  # N: Revealed type is "main.MyClass[float, str, Any]"
 
 
 - case: ioresult_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_reader/test_reader_based2.yml b/typesafety/test_interfaces/test_specific/test_reader/test_reader_based2.yml
index 8b994dc27..6cae0d726 100644
--- a/typesafety/test_interfaces/test_specific/test_reader/test_reader_based2.yml
+++ b/typesafety/test_interfaces/test_specific/test_reader/test_reader_based2.yml
@@ -49,7 +49,7 @@
         ...
 
     x: Reader[int, str]
-    reveal_type(MyClass.from_context(x).bind_context(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(MyClass.from_context(x).bind_context(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: reader_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_reader/test_reader_like2.yml b/typesafety/test_interfaces/test_specific/test_reader/test_reader_like2.yml
index 0e635588a..0ca297b8a 100644
--- a/typesafety/test_interfaces/test_specific/test_reader/test_reader_like2.yml
+++ b/typesafety/test_interfaces/test_specific/test_reader/test_reader_like2.yml
@@ -46,7 +46,7 @@
         ...
 
     x: Reader[int, str]
-    reveal_type(MyClass.from_context(x).bind_context(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(MyClass.from_context(x).bind_context(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: reader_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_reader/test_reader_like3.yml b/typesafety/test_interfaces/test_specific/test_reader/test_reader_like3.yml
index 8a787c240..594122a2a 100644
--- a/typesafety/test_interfaces/test_specific/test_reader/test_reader_like3.yml
+++ b/typesafety/test_interfaces/test_specific/test_reader/test_reader_like3.yml
@@ -50,7 +50,7 @@
         ...
 
     x: Reader[int, str]
-    reveal_type(MyClass.from_context(x).bind_context(test))  # N: Revealed type is "main.MyClass[builtins.float, Any, builtins.str]"
+    reveal_type(MyClass.from_context(x).bind_context(test))  # N: Revealed type is "main.MyClass[float, Any, str]"
 
 
 - case: reader_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_result/test_resultbased_inheritance.yml b/typesafety/test_interfaces/test_specific/test_result/test_resultbased_inheritance.yml
index 1acd24a21..3be296307 100644
--- a/typesafety/test_interfaces/test_specific/test_result/test_resultbased_inheritance.yml
+++ b/typesafety/test_interfaces/test_specific/test_result/test_resultbased_inheritance.yml
@@ -51,7 +51,7 @@
         ...
 
     x: Result[int, str]
-    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: result_inheritance_correct3
@@ -108,7 +108,7 @@
         ...
 
     x: Result[int, str]
-    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str, Any]"
+    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[float, str, Any]"
 
 
 - case: result_inheritance_missing
diff --git a/typesafety/test_interfaces/test_specific/test_result/test_resultlike_inheritance.yml b/typesafety/test_interfaces/test_specific/test_result/test_resultlike_inheritance.yml
index 1cbe614c7..6a906801b 100644
--- a/typesafety/test_interfaces/test_specific/test_result/test_resultlike_inheritance.yml
+++ b/typesafety/test_interfaces/test_specific/test_result/test_resultlike_inheritance.yml
@@ -36,7 +36,7 @@
         ...
 
     x: Result[int, str]
-    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[float, str]"
 
 
 - case: result_inheritance_correct3
@@ -78,7 +78,7 @@
         ...
 
     x: Result[int, str]
-    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str, Any]"
+    reveal_type(MyClass.from_result(x).bind_result(test))  # N: Revealed type is "main.MyClass[float, str, Any]"
 
 
 - case: result_inheritance_missing
diff --git a/typesafety/test_interfaces/test_unwrappable/test_inheritance.yml b/typesafety/test_interfaces/test_unwrappable/test_inheritance.yml
index bd865e1cb..5895096c9 100644
--- a/typesafety/test_interfaces/test_unwrappable/test_inheritance.yml
+++ b/typesafety/test_interfaces/test_unwrappable/test_inheritance.yml
@@ -22,8 +22,8 @@
             ...
 
     x = MyOwn(1, 'a')
-    reveal_type(x.unwrap())  # N: Revealed type is "builtins.int"
-    reveal_type(x.failure())  # N: Revealed type is "builtins.str"
+    reveal_type(x.unwrap())  # N: Revealed type is "int"
+    reveal_type(x.failure())  # N: Revealed type is "str"
 
 
 - case: unwrappable_missing_inheritance
diff --git a/typesafety/test_io/test_io_container/test_do.yml b/typesafety/test_io/test_io_container/test_do.yml
index e437aae68..d92a04517 100644
--- a/typesafety/test_io/test_io_container/test_do.yml
+++ b/typesafety/test_io/test_io_container/test_do.yml
@@ -6,7 +6,7 @@
 
     IO.do(
         x + y
-        for x in Success(1)  # E: Invalid type supplied in do-notation: expected "returns.io.IO[Any]", got "returns.result.Success[builtins.int]"  [misc]
+        for x in Success(1)  # E: Invalid type supplied in do-notation: expected "returns.io.IO[Any]", got "returns.result.Success[int]"  [misc]
         for y in IO(2.5)
     )
 
diff --git a/typesafety/test_io/test_io_container/test_impure.yml b/typesafety/test_io/test_io_container/test_impure.yml
index f7255b4da..e5fd294bb 100644
--- a/typesafety/test_io/test_io_container/test_impure.yml
+++ b/typesafety/test_io/test_io_container/test_impure.yml
@@ -7,7 +7,7 @@
     def test() -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def () -> returns.io.IO[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def () -> returns.io.IO[int]"
 
 
 - case: impure_composition_no_params
@@ -18,7 +18,7 @@
     def test() -> int:
         return 1
 
-    reveal_type(impure(test))  # N: Revealed type is "def () -> returns.io.IO[builtins.int]"
+    reveal_type(impure(test))  # N: Revealed type is "def () -> returns.io.IO[int]"
 
 
 - case: impure_decorator_with_args
@@ -31,7 +31,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.io.IO[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.io.IO[int]"
 
 
 - case: impure_composition_with_args
@@ -43,7 +43,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(impure(test))  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.io.IO[builtins.int]"
+    reveal_type(impure(test))  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.io.IO[int]"
 
 
 - case: impure_decorator_with_args_kwargs
@@ -55,7 +55,7 @@
     def test(*args, **kwargs) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.io.IO[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.io.IO[int]"
 
 
 - case: impure_decorator_with_typed_args_kwargs
@@ -67,4 +67,4 @@
     def test(*args: int, **kwargs: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: builtins.int, **kwargs: builtins.str) -> returns.io.IO[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (*args: int, **kwargs: str) -> returns.io.IO[int]"
diff --git a/typesafety/test_io/test_io_container/test_io_base.yml b/typesafety/test_io/test_io_container/test_io_base.yml
index b02133b75..ce8ab92da 100644
--- a/typesafety/test_io/test_io_container/test_io_base.yml
+++ b/typesafety/test_io/test_io_container/test_io_base.yml
@@ -3,7 +3,7 @@
   main: |
     from returns.io import IO
 
-    reveal_type(IO(1))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(IO(1))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: io_constructor2
@@ -11,7 +11,7 @@
   main: |
     from returns.io import IO
 
-    reveal_type(IO.from_value(1))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(IO.from_value(1))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: io_constructor3
@@ -19,7 +19,7 @@
   main: |
     from returns.io import IO
 
-    reveal_type(IO.from_io(IO(1)))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(IO.from_io(IO(1)))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: io_bind
@@ -30,7 +30,7 @@
     def bind_io(input_io: int) -> IO[str]:
         ...
 
-    reveal_type(IO(1).bind(bind_io))  # N: Revealed type is "returns.io.IO[builtins.str]"
+    reveal_type(IO(1).bind(bind_io))  # N: Revealed type is "returns.io.IO[str]"
 
 
 
@@ -42,7 +42,7 @@
     def bind_io(input_io: int) -> IO[str]:
         ...
 
-    reveal_type(IO(1).bind_io(bind_io))  # N: Revealed type is "returns.io.IO[builtins.str]"
+    reveal_type(IO(1).bind_io(bind_io))  # N: Revealed type is "returns.io.IO[str]"
 
 
 - case: io_map
@@ -50,7 +50,7 @@
   main: |
     from returns.io import IO
 
-    reveal_type(IO(1).map(str))  # N: Revealed type is "returns.io.IO[builtins.str]"
+    reveal_type(IO(1).map(str))  # N: Revealed type is "returns.io.IO[str]"
 
 
 - case: io_apply
@@ -61,4 +61,4 @@
     def transform(arg: int) -> str:
         ...
 
-    reveal_type(IO(1).apply(IO(transform)))  # N: Revealed type is "returns.io.IO[builtins.str]"
+    reveal_type(IO(1).apply(IO(transform)))  # N: Revealed type is "returns.io.IO[str]"
diff --git a/typesafety/test_io/test_io_container/test_io_type_cast.yml b/typesafety/test_io/test_io_container/test_io_type_cast.yml
index d79d69bfb..1e76f61af 100644
--- a/typesafety/test_io/test_io_container/test_io_type_cast.yml
+++ b/typesafety/test_io/test_io_container/test_io_type_cast.yml
@@ -5,7 +5,7 @@
 
     first: IO[ValueError]
     second: IO[Exception] = first
-    reveal_type(second)  # N: Revealed type is "returns.io.IO[builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.io.IO[Exception]"
 
 
 - case: io_from_ioresult
@@ -15,7 +15,7 @@
 
     x: IOResult[int, str]
 
-    reveal_type(IO.from_ioresult(x))  # N: Revealed type is "returns.io.IO[returns.result.Result[builtins.int, builtins.str]]"
+    reveal_type(IO.from_ioresult(x))  # N: Revealed type is "returns.io.IO[returns.result.Result[int, str]]"
 
 
 - case: io_getattr
diff --git a/typesafety/test_io/test_ioresult_container/test_construct_iofailure.yml b/typesafety/test_io/test_ioresult_container/test_construct_iofailure.yml
index be0ddb86d..a77831d7a 100644
--- a/typesafety/test_io/test_ioresult_container/test_construct_iofailure.yml
+++ b/typesafety/test_io/test_ioresult_container/test_construct_iofailure.yml
@@ -7,7 +7,7 @@
         ...
 
     first: IOResult[str, int] = IOFailure(1)
-    reveal_type(first.lash(returns_result))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.Exception]"
+    reveal_type(first.lash(returns_result))  # N: Revealed type is "returns.io.IOResult[str, Exception]"
 
 
 - case: iofailure_alt
@@ -15,7 +15,7 @@
   main: |
     from returns.io import IOFailure
 
-    reveal_type(IOFailure(1).alt(str))  # N: Revealed type is "returns.io.IOResult[Any, builtins.str]"
+    reveal_type(IOFailure(1).alt(str))  # N: Revealed type is "returns.io.IOResult[Any, str]"
 
 
 - case: iofailure_iofailure
@@ -23,4 +23,4 @@
   main: |
     from returns.io import IOFailure
 
-    reveal_type(IOFailure(1).failure())  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(IOFailure(1).failure())  # N: Revealed type is "returns.io.IO[int]"
diff --git a/typesafety/test_io/test_ioresult_container/test_construct_iosucess.yml b/typesafety/test_io/test_ioresult_container/test_construct_iosucess.yml
index c588412bd..6b537fb5e 100644
--- a/typesafety/test_io/test_ioresult_container/test_construct_iosucess.yml
+++ b/typesafety/test_io/test_ioresult_container/test_construct_iosucess.yml
@@ -7,7 +7,7 @@
         ...
 
     first: IOResult[int, Exception] = IOSuccess(1)
-    reveal_type(first.bind(returns_result))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.Exception]"
+    reveal_type(first.bind(returns_result))  # N: Revealed type is "returns.io.IOResult[str, Exception]"
 
 
 - case: iosuccess_bind_result
@@ -20,7 +20,7 @@
         ...
 
     first: IOResult[int, Exception] = IOSuccess(1)
-    reveal_type(first.bind_result(returns_result))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.Exception]"
+    reveal_type(first.bind_result(returns_result))  # N: Revealed type is "returns.io.IOResult[str, Exception]"
 
 
 - case: iosuccess_bind_io
@@ -32,7 +32,7 @@
         ...
 
     first: IOResult[int, Exception] = IOSuccess(1)
-    reveal_type(first.bind_io(returns_io))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.Exception]"
+    reveal_type(first.bind_io(returns_io))  # N: Revealed type is "returns.io.IOResult[str, Exception]"
 
 
 - case: iosuccess_map
@@ -40,7 +40,7 @@
   main: |
     from returns.io import IOSuccess, IOResult
 
-    reveal_type(IOSuccess(1).map(str))  # N: Revealed type is "returns.io.IOResult[builtins.str, Any]"
+    reveal_type(IOSuccess(1).map(str))  # N: Revealed type is "returns.io.IOResult[str, Any]"
 
 
 - case: iosuccess_apply
@@ -51,7 +51,7 @@
     def transform(arg: int) -> str:
         ...
 
-    reveal_type(IOSuccess(1).apply(IOSuccess(transform)))  # N: Revealed type is "returns.io.IOResult[builtins.str, Any]"
+    reveal_type(IOSuccess(1).apply(IOSuccess(transform)))  # N: Revealed type is "returns.io.IOResult[str, Any]"
 
 
 - case: iosuccess_value_or
@@ -59,7 +59,7 @@
   main: |
     from returns.io import IOSuccess
 
-    reveal_type(IOSuccess(1).value_or(None))  # N: Revealed type is "returns.io.IO[builtins.int | None]"
+    reveal_type(IOSuccess(1).value_or(None))  # N: Revealed type is "returns.io.IO[int | None]"
 
 
 - case: iosuccess_unwrap
@@ -67,4 +67,4 @@
   main: |
     from returns.io import IOSuccess
 
-    reveal_type(IOSuccess(1).unwrap())  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(IOSuccess(1).unwrap())  # N: Revealed type is "returns.io.IO[int]"
diff --git a/typesafety/test_io/test_ioresult_container/test_do.yml b/typesafety/test_io/test_ioresult_container/test_do.yml
index e25777019..ac5ce13d7 100644
--- a/typesafety/test_io/test_ioresult_container/test_do.yml
+++ b/typesafety/test_io/test_ioresult_container/test_do.yml
@@ -3,7 +3,7 @@
   main: |
     from returns.io import IOResult, IOFailure
 
-    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[Any, builtins.int | builtins.str]"
+    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[Any, int | str]"
         first / second
         for first in IOFailure(1)
         for second in IOFailure('a')
@@ -15,7 +15,7 @@
   main: |
     from returns.io import IOSuccess, IOResult
 
-    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[builtins.float, Never]"
+    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[float, Never]"
         x + y
         for x in IOSuccess(1)
         for y in IOSuccess(2.5)
@@ -30,7 +30,7 @@
     a: IOResult[int, str]
     b: IOResult[float, bytes]
 
-    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[builtins.float, builtins.str | builtins.bytes]"
+    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[float, str | bytes]"
         x + y
         for x in a
         for y in b
@@ -45,7 +45,7 @@
 
     IOResult.do(
         x + y
-        for x in Success(1)  # E: Invalid type supplied in do-notation: expected "returns.io.IOResult[Any, Any]", got "returns.result.Success[builtins.int]"  [misc]
+        for x in Success(1)  # E: Invalid type supplied in do-notation: expected "returns.io.IOResult[Any, Any]", got "returns.result.Success[int]"  [misc]
         for y in IOSuccess(2.5)
     )
 
@@ -58,7 +58,7 @@
 
     a: Result[int, str]
 
-    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[builtins.float, builtins.str]"
+    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[float, str]"
         x + y
         for x in IOResult.from_result(a)
         for y in IOSuccess(2.5)
@@ -98,12 +98,12 @@
     from returns.io import IOResult, IOResultE, IOSuccess
 
     x: IOResultE[int]
-    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(IOResult.do(  # N: Revealed type is "returns.io.IOResult[int, Exception]"
         a + 2
         for a in x
     ))
 
-    reveal_type(IOResultE.do(  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(IOResultE.do(  # N: Revealed type is "returns.io.IOResult[int, Exception]"
         a + 2
         for a in x
     ))
diff --git a/typesafety/test_io/test_ioresult_container/test_impure_safe.yml b/typesafety/test_io/test_ioresult_container/test_impure_safe.yml
index fff048e76..3ad36fba5 100644
--- a/typesafety/test_io/test_ioresult_container/test_impure_safe.yml
+++ b/typesafety/test_io/test_ioresult_container/test_impure_safe.yml
@@ -7,7 +7,7 @@
     def test(arg: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (arg: builtins.str) -> returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def (arg: str) -> returns.io.IOResult[int, Exception]"
 
 
 - case: impure_decorator_passing_exceptions_no_params
@@ -19,10 +19,10 @@
     def test1(arg: str) -> int:
         return 1
 
-    reveal_type(test1)  # N: Revealed type is "def (arg: builtins.str) -> returns.io.IOResult[builtins.int, builtins.ValueError]"
+    reveal_type(test1)  # N: Revealed type is "def (arg: str) -> returns.io.IOResult[int, ValueError]"
 
     @impure_safe(exceptions=(ValueError,))
     def test2(arg: str) -> int:
         return 1
 
-    reveal_type(test2)  # N: Revealed type is "def (arg: builtins.str) -> returns.io.IOResult[builtins.int, builtins.ValueError]"
+    reveal_type(test2)  # N: Revealed type is "def (arg: str) -> returns.io.IOResult[int, ValueError]"
diff --git a/typesafety/test_io/test_ioresult_container/test_ioresult_helpers.yml b/typesafety/test_io/test_ioresult_container/test_ioresult_helpers.yml
index f22f0f78b..fc7709957 100644
--- a/typesafety/test_io/test_ioresult_container/test_ioresult_helpers.yml
+++ b/typesafety/test_io/test_ioresult_container/test_ioresult_helpers.yml
@@ -6,7 +6,7 @@
 
     container: IO[Result[int, str]]
 
-    reveal_type(IOResult.from_typecast(container))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(IOResult.from_typecast(container))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: ioresult_from_io
@@ -16,7 +16,7 @@
 
     container: IO[str]
 
-    reveal_type(IOResult.from_io(container))  # N: Revealed type is "returns.io.IOResult[builtins.str, Any]"
+    reveal_type(IOResult.from_io(container))  # N: Revealed type is "returns.io.IOResult[str, Any]"
 
 
 - case: ioresult_from_failed_io
@@ -26,4 +26,4 @@
 
     container: IO[str]
 
-    reveal_type(IOResult.from_failed_io(container))  # N: Revealed type is "returns.io.IOResult[Any, builtins.str]"
+    reveal_type(IOResult.from_failed_io(container))  # N: Revealed type is "returns.io.IOResult[Any, str]"
diff --git a/typesafety/test_io/test_ioresult_container/test_ioresult_typecast.yml b/typesafety/test_io/test_ioresult_container/test_ioresult_typecast.yml
index 148747ca5..730b74b88 100644
--- a/typesafety/test_io/test_ioresult_container/test_ioresult_typecast.yml
+++ b/typesafety/test_io/test_ioresult_container/test_ioresult_typecast.yml
@@ -4,7 +4,7 @@
     from returns.io import IOResult, IOSuccess
 
     first: IOResult[int, Exception] = IOSuccess(1)
-    reveal_type(first)  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.io.IOResult[int, Exception]"
 
 
 - case: ioresult_failure_cast1
@@ -13,7 +13,7 @@
     from returns.io import IOResult, IOFailure
 
     first: IOResult[int, Exception] = IOFailure(Exception())
-    reveal_type(first)  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.io.IOResult[int, Exception]"
 
 
 - case: ioresult_failure_cast2
@@ -22,7 +22,7 @@
     from returns.io import IOResult, IOFailure
 
     first: IOResult[int, Exception] = IOFailure(TypeError())
-    reveal_type(first)  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.io.IOResult[int, Exception]"
 
 
 - case: ioresult_swap
@@ -31,7 +31,7 @@
     from returns.io import IOResult
 
     x: IOResult[int, str]
-    reveal_type(x.swap())  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.int]"
+    reveal_type(x.swap())  # N: Revealed type is "returns.io.IOResult[str, int]"
 
 
 - case: ioresult_getattr
@@ -48,7 +48,7 @@
   main: |
     from returns.io import IOResult
 
-    reveal_type(IOResult.from_value(1))  # N: Revealed type is "returns.io.IOResult[builtins.int, Any]"
+    reveal_type(IOResult.from_value(1))  # N: Revealed type is "returns.io.IOResult[int, Any]"
 
 
 - case: ioresult_from_failure
@@ -56,7 +56,7 @@
   main: |
     from returns.io import IOResult
 
-    reveal_type(IOResult.from_failure(1))  # N: Revealed type is "returns.io.IOResult[Any, builtins.int]"
+    reveal_type(IOResult.from_failure(1))  # N: Revealed type is "returns.io.IOResult[Any, int]"
 
 
 - case: ioresult_covariant_cast
@@ -66,7 +66,7 @@
 
     first: IOResult[TypeError, ValueError]  # we cast both values
     second: IOResult[Exception, Exception] = first
-    reveal_type(second)  # N: Revealed type is "returns.io.IOResult[builtins.Exception, builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.io.IOResult[Exception, Exception]"
 
 
 - case: ioresult_success_bind_contra1
@@ -78,7 +78,7 @@
       ...
 
     first: IOResult[int, str] = IOSuccess(4)
-    reveal_type(first.bind(test))  # N: Revealed type is "returns.io.IOResult[builtins.float, builtins.str]"
+    reveal_type(first.bind(test))  # N: Revealed type is "returns.io.IOResult[float, str]"
 
 
 - case: ioresult_success_bind_contra2
@@ -91,7 +91,7 @@
 
     first: IOResult[int, Exception]
     second = first.bind(test)
-    reveal_type(second)  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.io.IOResult[int, Exception]"
 
 
 - case: ioresult_correct_usage
@@ -104,7 +104,7 @@
             return IOSuccess(inner_value + 2)
         return IOFailure(str(inner_value))
 
-    reveal_type(factory(1))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(factory(1))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: ioresulte_typecast1
@@ -118,7 +118,7 @@
         return IOFailure(ValueError(arg))
 
     result: IOResult[int, Exception] = function(1)
-    reveal_type(result)  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(result)  # N: Revealed type is "returns.io.IOResult[int, Exception]"
 
 
 - case: ioresulte_typecast2
@@ -132,4 +132,4 @@
         return IOFailure(ValueError(arg))
 
     result: IOResultE[int] = function(1)
-    reveal_type(result)  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.Exception]"
+    reveal_type(result)  # N: Revealed type is "returns.io.IOResult[int, Exception]"
diff --git a/typesafety/test_iterables/test_fold/test_fold_collect.yml b/typesafety/test_iterables/test_fold/test_fold_collect.yml
index 97c2e4fe3..a50b04ae0 100644
--- a/typesafety/test_iterables/test_fold/test_fold_collect.yml
+++ b/typesafety/test_iterables/test_fold/test_fold_collect.yml
@@ -15,13 +15,13 @@
 
     acc: Result[tuple[()], str]
 
-    reveal_type(Fold.collect(x1, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect(x2, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect(x3, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect(x4, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect(x5, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect(x6, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect(x7, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
+    reveal_type(Fold.collect(x1, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect(x2, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect(x3, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect(x4, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect(x5, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect(x6, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect(x7, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
 
 
 - case: fold_collect_io
@@ -33,7 +33,7 @@
 
     acc = IO(())
     x: Iterable[IO[float]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.io.IO[builtins.tuple[builtins.float, ...]]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.io.IO[tuple[float, ...]]"
 
 
 - case: fold_collect_maybe
@@ -45,7 +45,7 @@
 
     acc = Maybe.from_value(())
     x: Iterable[Maybe[float]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.maybe.Maybe[builtins.tuple[builtins.float, ...]]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.maybe.Maybe[tuple[float, ...]]"
 
 
 - case: fold_collect_result
@@ -57,7 +57,7 @@
 
     acc: Result[tuple[()], str]
     x: Iterable[Result[float, str]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.result.Result[tuple[float, ...], str]"
 
 
 - case: fold_collect_ioresult
@@ -69,7 +69,7 @@
 
     acc: IOResult[tuple[()], str]
     x: Iterable[IOResult[float, str]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.io.IOResult[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.io.IOResult[tuple[float, ...], str]"
 
 
 - case: fold_collect_requires_context
@@ -81,7 +81,7 @@
 
     acc: RequiresContext[tuple[()], str]
     x: Iterable[RequiresContext[float, str]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context.RequiresContext[tuple[float, ...], str]"
 
 
 - case: fold_collect_requires_context_result
@@ -93,7 +93,7 @@
 
     acc: RequiresContextResult[tuple[()], str, bool]
     x: Iterable[RequiresContextResult[float, str, bool]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.tuple[builtins.float, ...], builtins.str, builtins.bool]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[tuple[float, ...], str, bool]"
 
 
 - case: fold_collect_requires_context_ioresult
@@ -105,7 +105,7 @@
 
     acc: RequiresContextIOResult[tuple[()], str, bool]
     x: Iterable[RequiresContextIOResult[float, str, bool]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.tuple[builtins.float, ...], builtins.str, builtins.bool]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[tuple[float, ...], str, bool]"
 
 
 - case: fold_collect_requires_context_future_result
@@ -117,7 +117,7 @@
 
     acc: RequiresContextFutureResult[tuple[()], str, bool]
     x: Iterable[RequiresContextFutureResult[float, str, bool]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.tuple[builtins.float, ...], builtins.str, builtins.bool]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[tuple[float, ...], str, bool]"
 
 
 - case: fold_collect_future
@@ -129,7 +129,7 @@
 
     acc: Future[tuple[()]]
     x: Iterable[Future[float]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.future.Future[builtins.tuple[builtins.float, ...]]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.future.Future[tuple[float, ...]]"
 
 
 - case: fold_collect_future_result
@@ -141,7 +141,7 @@
 
     acc: FutureResult[tuple[()], str]
     x: Iterable[FutureResult[float, str]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.future.FutureResult[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "returns.future.FutureResult[tuple[float, ...], str]"
 
 
 - case: fold_collect_custom_type
@@ -159,4 +159,4 @@
 
     acc: MyClass[tuple[()]]
     x: Iterable[MyClass[float]]
-    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "main.MyClass[builtins.tuple[builtins.float, ...]]"
+    reveal_type(Fold.collect(x, acc))  # N: Revealed type is "main.MyClass[tuple[float, ...]]"
diff --git a/typesafety/test_iterables/test_fold/test_fold_collect_all.yml b/typesafety/test_iterables/test_fold/test_fold_collect_all.yml
index e086f3cee..5f3aaa55e 100644
--- a/typesafety/test_iterables/test_fold/test_fold_collect_all.yml
+++ b/typesafety/test_iterables/test_fold/test_fold_collect_all.yml
@@ -15,13 +15,13 @@
 
     acc: Result[tuple[()], str]
 
-    reveal_type(Fold.collect_all(x1, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect_all(x2, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect_all(x3, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect_all(x4, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect_all(x5, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect_all(x6, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
-    reveal_type(Fold.collect_all(x7, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.int, ...], builtins.str]"
+    reveal_type(Fold.collect_all(x1, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect_all(x2, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect_all(x3, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect_all(x4, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect_all(x5, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect_all(x6, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
+    reveal_type(Fold.collect_all(x7, acc))  # N: Revealed type is "returns.result.Result[tuple[int, ...], str]"
 
 
 - case: fold_collect_all_wrong_type
@@ -45,7 +45,7 @@
 
     acc = Maybe.from_value(())
     x: Iterable[Maybe[float]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.maybe.Maybe[builtins.tuple[builtins.float, ...]]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.maybe.Maybe[tuple[float, ...]]"
 
 
 - case: fold_collect_all_result
@@ -57,7 +57,7 @@
 
     acc: Result[tuple[()], str]
     x: Iterable[Result[float, str]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.result.Result[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.result.Result[tuple[float, ...], str]"
 
 
 - case: fold_collect_all_ioresult
@@ -69,7 +69,7 @@
 
     acc: IOResult[tuple[()], str]
     x: Iterable[IOResult[float, str]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.io.IOResult[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.io.IOResult[tuple[float, ...], str]"
 
 
 - case: fold_collect_all_requires_context_result
@@ -81,7 +81,7 @@
 
     acc: RequiresContextResult[tuple[()], str, bool]
     x: Iterable[RequiresContextResult[float, str, bool]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.tuple[builtins.float, ...], builtins.str, builtins.bool]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[tuple[float, ...], str, bool]"
 
 
 - case: fold_collect_all_requires_context_ioresult
@@ -93,7 +93,7 @@
 
     acc: RequiresContextIOResult[tuple[()], str, bool]
     x: Iterable[RequiresContextIOResult[float, str, bool]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.tuple[builtins.float, ...], builtins.str, builtins.bool]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[tuple[float, ...], str, bool]"
 
 
 - case: fold_collect_all_requires_context_future_result
@@ -105,7 +105,7 @@
 
     acc: RequiresContextFutureResult[tuple[()], str, bool]
     x: Iterable[RequiresContextFutureResult[float, str, bool]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.tuple[builtins.float, ...], builtins.str, builtins.bool]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[tuple[float, ...], str, bool]"
 
 
 - case: fold_collect_all_future_result
@@ -117,7 +117,7 @@
 
     acc: FutureResult[tuple[()], str]
     x: Iterable[FutureResult[float, str]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.future.FutureResult[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "returns.future.FutureResult[tuple[float, ...], str]"
 
 
 - case: fold_collect_all_custom_type
@@ -136,4 +136,4 @@
 
     acc: MyClass[tuple[()], str]
     x: Iterable[MyClass[float, str]]
-    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "main.MyClass[builtins.tuple[builtins.float, ...], builtins.str]"
+    reveal_type(Fold.collect_all(x, acc))  # N: Revealed type is "main.MyClass[tuple[float, ...], str]"
diff --git a/typesafety/test_iterables/test_fold/test_fold_loop.yml b/typesafety/test_iterables/test_fold/test_fold_loop.yml
index 969870c20..9d3c4b092 100644
--- a/typesafety/test_iterables/test_fold/test_fold_loop.yml
+++ b/typesafety/test_iterables/test_fold/test_fold_loop.yml
@@ -20,13 +20,13 @@
     def div(first: int) -> Callable[[float], float]:
         return lambda second: first / second
 
-    reveal_type(Fold.loop(x1, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
-    reveal_type(Fold.loop(x2, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
-    reveal_type(Fold.loop(x3, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
-    reveal_type(Fold.loop(x4, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
-    reveal_type(Fold.loop(x5, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
-    reveal_type(Fold.loop(x6, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
-    reveal_type(Fold.loop(x7, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
+    reveal_type(Fold.loop(x1, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
+    reveal_type(Fold.loop(x2, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
+    reveal_type(Fold.loop(x3, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
+    reveal_type(Fold.loop(x4, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
+    reveal_type(Fold.loop(x5, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
+    reveal_type(Fold.loop(x6, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
+    reveal_type(Fold.loop(x7, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
 
 
 - case: fold_loop_io
@@ -41,7 +41,7 @@
 
     acc: IO[float]
     x: Iterable[IO[int]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.io.IO[builtins.float]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.io.IO[float]"
 
 
 - case: fold_loop_maybe
@@ -56,7 +56,7 @@
 
     acc: Maybe[float]
     x: Iterable[Maybe[int]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.maybe.Maybe[builtins.float]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.maybe.Maybe[float]"
 
 
 - case: fold_loop_result
@@ -71,7 +71,7 @@
 
     acc: Result[float, str]
     x: Iterable[Result[int, str]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.result.Result[float, str]"
 
 
 - case: fold_loop_ioresult
@@ -86,7 +86,7 @@
 
     acc: IOResult[float, str]
     x: Iterable[IOResult[int, str]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.io.IOResult[builtins.float, builtins.str]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.io.IOResult[float, str]"
 
 
 - case: fold_loop_requires_context
@@ -101,7 +101,7 @@
 
     acc: RequiresContext[float, str]
     x: Iterable[RequiresContext[int, str]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.float, builtins.str]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context.RequiresContext[float, str]"
 
 
 - case: fold_loop_requires_context_result
@@ -116,7 +116,7 @@
 
     acc: RequiresContextResult[float, str, bool]
     x: Iterable[RequiresContextResult[int, str, bool]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.float, builtins.str, builtins.bool]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[float, str, bool]"
 
 
 - case: fold_loop_requires_context_ioresult
@@ -131,7 +131,7 @@
 
     acc: RequiresContextIOResult[float, str, bool]
     x: Iterable[RequiresContextIOResult[int, str, bool]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.str, builtins.bool]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[float, str, bool]"
 
 
 - case: fold_loop_requires_context_future_result
@@ -146,7 +146,7 @@
 
     acc: RequiresContextFutureResult[float, str, bool]
     x: Iterable[RequiresContextFutureResult[int, str, bool]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.float, builtins.str, builtins.bool]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[float, str, bool]"
 
 
 - case: fold_loop_future
@@ -161,7 +161,7 @@
 
     acc: Future[float]
     x: Iterable[Future[int]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.future.Future[builtins.float]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.future.Future[float]"
 
 
 - case: fold_loop_future_result
@@ -176,7 +176,7 @@
 
     acc: FutureResult[float, str]
     x: Iterable[FutureResult[int, str]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: fold_loop_custom_type
@@ -197,4 +197,4 @@
 
     acc: MyClass[float]
     x: Iterable[MyClass[int]]
-    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "main.MyClass[builtins.float]"
+    reveal_type(Fold.loop(x, acc, div))  # N: Revealed type is "main.MyClass[float]"
diff --git a/typesafety/test_maybe/test_do.yml b/typesafety/test_maybe/test_do.yml
index 4c1762d5a..d1c2eb4d2 100644
--- a/typesafety/test_maybe/test_do.yml
+++ b/typesafety/test_maybe/test_do.yml
@@ -18,7 +18,7 @@
 
     Maybe.do(
         x + y
-        for x in Success(1)  # E: Invalid type supplied in do-notation: expected "returns.maybe.Maybe[Any]", got "returns.result.Success[builtins.int]"  [misc]
+        for x in Success(1)  # E: Invalid type supplied in do-notation: expected "returns.maybe.Maybe[Any]", got "returns.result.Success[int]"  [misc]
         for y in Maybe.from_value(2.5)
     )
 
@@ -32,7 +32,7 @@
 
     a: Result[int, str]
 
-    reveal_type(Maybe.do(  # N: Revealed type is "returns.maybe.Maybe[builtins.float]"
+    reveal_type(Maybe.do(  # N: Revealed type is "returns.maybe.Maybe[float]"
         x + y
         for x in result_to_maybe(a)
         for y in Maybe.from_value(2.5)
diff --git a/typesafety/test_maybe/test_maybe_decorator.yml b/typesafety/test_maybe/test_maybe_decorator.yml
index dc3b9777a..18fea0267 100644
--- a/typesafety/test_maybe/test_maybe_decorator.yml
+++ b/typesafety/test_maybe/test_maybe_decorator.yml
@@ -7,7 +7,7 @@
     def test() -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def () -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def () -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_decorator_no_params_optional
@@ -20,7 +20,7 @@
     def test() -> Optional[int]:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def () -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def () -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_composition_no_params
@@ -31,7 +31,7 @@
     def test() -> int:
         return 1
 
-    reveal_type(maybe(test))  # N: Revealed type is "def () -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(maybe(test))  # N: Revealed type is "def () -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_decorator_with_args
@@ -44,7 +44,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_composition_with_args
@@ -56,7 +56,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(maybe(test))  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(maybe(test))  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_decorator_with_args_kwargs
@@ -68,7 +68,7 @@
     def test(*args, **kwargs) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_decorator_with_typed_args_kwargs
@@ -80,7 +80,7 @@
     def test(*args: int, **kwargs: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: builtins.int, **kwargs: builtins.str) -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (*args: int, **kwargs: str) -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_decorator_with_optional
@@ -93,7 +93,7 @@
     def test() -> Optional[int]:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def () -> returns.maybe.Maybe[builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def () -> returns.maybe.Maybe[int]"
 
 
 - case: maybe_multiple_decorators
@@ -108,4 +108,4 @@
     def test() -> Optional[int]:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def () -> returns.io.IO[returns.maybe.Maybe[builtins.int]]"
+    reveal_type(test)  # N: Revealed type is "def () -> returns.io.IO[returns.maybe.Maybe[int]]"
diff --git a/typesafety/test_maybe/test_maybe_type.yml b/typesafety/test_maybe/test_maybe_type.yml
index 69e935a4f..4b021b2dd 100644
--- a/typesafety/test_maybe/test_maybe_type.yml
+++ b/typesafety/test_maybe/test_maybe_type.yml
@@ -4,7 +4,7 @@
     from returns.maybe import Maybe
 
     value: int
-    reveal_type(Maybe.from_value(value))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(Maybe.from_value(value))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: maybe_from_value2
@@ -14,7 +14,7 @@
     from returns.maybe import Maybe
 
     value: Optional[int]
-    reveal_type(Maybe.from_value(value))  # N: Revealed type is "returns.maybe.Maybe[builtins.int | None]"
+    reveal_type(Maybe.from_value(value))  # N: Revealed type is "returns.maybe.Maybe[int | None]"
 
 
 - case: maybe_from_optional1
@@ -24,7 +24,7 @@
     from returns.maybe import Maybe
 
     value: int
-    reveal_type(Maybe.from_optional(value))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(Maybe.from_optional(value))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: maybe_from_optional2
@@ -34,7 +34,7 @@
     from returns.maybe import Maybe
 
     value: Optional[int]
-    reveal_type(Maybe.from_optional(value))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(Maybe.from_optional(value))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: maybe_map_regular
@@ -43,7 +43,7 @@
     from returns.maybe import Maybe
 
     result = Maybe.from_value(1).map(lambda i: i / i)
-    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[builtins.float]"
+    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[float]"
 
 
 - case: maybe_map_optional1
@@ -52,7 +52,7 @@
     from returns.maybe import Maybe
 
     result = Maybe.from_value({'a': 'b'}).map(lambda d: d.get('a', None))
-    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[builtins.str | None]"
+    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[str | None]"
 
 
 - case: maybe_map_optional2
@@ -61,7 +61,7 @@
     from returns.maybe import Maybe
 
     result = Maybe.from_value(1).bind(lambda d: Maybe.from_value(str(d)))
-    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[builtins.str]"
+    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[str]"
 
 
 - case: maybe_apply
@@ -70,7 +70,7 @@
     from returns.maybe import Maybe
 
     result = Maybe.from_value(1).apply(Maybe.from_value(float))
-    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[builtins.float]"
+    reveal_type(result)  # N: Revealed type is "returns.maybe.Maybe[float]"
 
 
 - case: maybe_bind1
@@ -81,7 +81,7 @@
     def test(arg: int) -> Maybe[str]:
         ...
 
-    reveal_type(Maybe.from_value(1).bind(test))  # N: Revealed type is "returns.maybe.Maybe[builtins.str]"
+    reveal_type(Maybe.from_value(1).bind(test))  # N: Revealed type is "returns.maybe.Maybe[str]"
 
 
 - case: maybe_bind2
@@ -93,7 +93,7 @@
     def test(arg: int) -> Maybe[Optional[str]]:
         ...
 
-    reveal_type(Maybe.from_value(1).bind(test))  # N: Revealed type is "returns.maybe.Maybe[builtins.str | None]"
+    reveal_type(Maybe.from_value(1).bind(test))  # N: Revealed type is "returns.maybe.Maybe[str | None]"
 
 
 - case: maybe_bind_optional
@@ -105,7 +105,7 @@
     def test(arg: int) -> Optional[str]:
         ...
 
-    reveal_type(Maybe.from_value(1).bind_optional(test))  # N: Revealed type is "returns.maybe.Maybe[builtins.str]"
+    reveal_type(Maybe.from_value(1).bind_optional(test))  # N: Revealed type is "returns.maybe.Maybe[str]"
 
 
 - case: maybe_value_or
@@ -114,7 +114,7 @@
     from returns.maybe import Maybe
 
     result = Maybe.from_value(1).value_or(None)
-    reveal_type(result)  # N: Revealed type is "builtins.int | None"
+    reveal_type(result)  # N: Revealed type is "int | None"
 
 
 - case: maybe_or_else1
@@ -123,7 +123,7 @@
     from returns.maybe import Maybe
 
     result = Maybe.from_value(1).or_else_call(lambda: 2)
-    reveal_type(result)  # N: Revealed type is "builtins.int"
+    reveal_type(result)  # N: Revealed type is "int"
 
 
 - case: maybe_or_else2
@@ -135,7 +135,7 @@
         ...
 
     result = Maybe.from_value(1).or_else_call(fallback)
-    reveal_type(result)  # N: Revealed type is "builtins.int | builtins.str"
+    reveal_type(result)  # N: Revealed type is "int | str"
 
 
 - case: maybe_or_else3
@@ -148,7 +148,7 @@
         ...
 
     result = Maybe.from_value(1).or_else_call(fallback)
-    reveal_type(result)  # N: Revealed type is "builtins.int"
+    reveal_type(result)  # N: Revealed type is "int"
 
 
 - case: maybe_unwrap
@@ -156,4 +156,4 @@
   main: |
     from returns.maybe import Some
 
-    reveal_type(Some(1).unwrap())  # N: Revealed type is "builtins.int"
+    reveal_type(Some(1).unwrap())  # N: Revealed type is "int"
diff --git a/typesafety/test_maybe/test_maybe_type_cast.yml b/typesafety/test_maybe/test_maybe_type_cast.yml
index 185413878..4adf1369d 100644
--- a/typesafety/test_maybe/test_maybe_type_cast.yml
+++ b/typesafety/test_maybe/test_maybe_type_cast.yml
@@ -5,7 +5,7 @@
 
     first: Maybe[ValueError]
     second: Maybe[Exception] = first
-    reveal_type(second)  # N: Revealed type is "returns.maybe.Maybe[builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.maybe.Maybe[Exception]"
 
 
 - case: maybe_getattr
@@ -22,7 +22,7 @@
   main: |
     from returns.maybe import Some
 
-    reveal_type(Some(1))  # N: Revealed type is "returns.maybe.Some[builtins.int]"
+    reveal_type(Some(1))  # N: Revealed type is "returns.maybe.Some[int]"
 
 
 - case: maybe_nothing_const
diff --git a/typesafety/test_methods/test_cond.yml b/typesafety/test_methods/test_cond.yml
index 849c270ac..9f40126f2 100644
--- a/typesafety/test_methods/test_cond.yml
+++ b/typesafety/test_methods/test_cond.yml
@@ -4,7 +4,7 @@
     from returns.methods import cond
     from returns.result import Result
 
-    reveal_type(cond(Result, True, 42, '42'))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(cond(Result, True, 42, '42'))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: cond_ioresult
@@ -13,7 +13,7 @@
     from returns.io import IOResult
     from returns.methods import cond
 
-    reveal_type(cond(IOResult, False, 'success', 'failure'))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.str]"
+    reveal_type(cond(IOResult, False, 'success', 'failure'))  # N: Revealed type is "returns.io.IOResult[str, str]"
 
 
 - case: cond_future_result
@@ -22,7 +22,7 @@
     from returns.future import FutureResult
     from returns.methods import cond
 
-    reveal_type(cond(FutureResult, False, True, False))  # N: Revealed type is "returns.future.FutureResult[builtins.bool, builtins.bool]"
+    reveal_type(cond(FutureResult, False, True, False))  # N: Revealed type is "returns.future.FutureResult[bool, bool]"
 
 
 - case: cond_reader_result
@@ -31,7 +31,7 @@
     from returns.methods import cond
     from returns.context import ReaderResult
 
-    reveal_type(cond(ReaderResult, True, 1.0, False))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.float, builtins.bool, Any]"
+    reveal_type(cond(ReaderResult, True, 1.0, False))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[float, bool, Any]"
 
 
 - case: cond_reader_ioresult
@@ -40,7 +40,7 @@
     from returns.methods import cond
     from returns.context import ReaderIOResult
 
-    reveal_type(cond(ReaderIOResult, True, 1.0, False))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.bool, Any]"
+    reveal_type(cond(ReaderIOResult, True, 1.0, False))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[float, bool, Any]"
 
 
 - case: cond_reader_future_result
@@ -49,7 +49,7 @@
     from returns.methods import cond
     from returns.context import ReaderFutureResult
 
-    reveal_type(cond(ReaderFutureResult, True, 1, 1.0))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.float, Any]"
+    reveal_type(cond(ReaderFutureResult, True, 1, 1.0))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, float, Any]"
 
 
 - case: cond_maybe
@@ -58,7 +58,7 @@
     from returns.methods import cond
     from returns.maybe import Maybe
 
-    reveal_type(cond(Maybe, True, 'test'))  # N: Revealed type is "returns.maybe.Maybe[builtins.str]"
+    reveal_type(cond(Maybe, True, 'test'))  # N: Revealed type is "returns.maybe.Maybe[str]"
 
 
 - case: cond_custom_type
@@ -81,5 +81,5 @@
 
     reveal_type(cond(MyOwn, True, 'test', 1.0))
   out: |
-    main:16: note: Revealed type is "main.MyOwn[builtins.str, builtins.float]"
+    main:16: note: Revealed type is "main.MyOwn[str, float]"
     main:16: error: Only concrete class can be given where "type[MyOwn[Any, Any]]" is expected  [type-abstract]
diff --git a/typesafety/test_methods/test_partition.yml b/typesafety/test_methods/test_partition.yml
index 92041edc5..fc0d152aa 100644
--- a/typesafety/test_methods/test_partition.yml
+++ b/typesafety/test_methods/test_partition.yml
@@ -6,7 +6,7 @@
     from returns.methods import partition
 
     x: list[Result[int, str]]
-    reveal_type(partition(x))  # N: Revealed type is "tuple[builtins.list[builtins.int], builtins.list[builtins.str]]"
+    reveal_type(partition(x))  # N: Revealed type is "tuple[list[int], list[str]]"
 
 
 - case: partition_io_results
@@ -18,7 +18,7 @@
     from returns.io import IO, IOResult, IOSuccess
 
     x: tuple[IOResult[int, str], IOResult[int, str]]
-    reveal_type(partition(x))  # N: Revealed type is "tuple[builtins.list[returns.io.IO[builtins.int]], builtins.list[returns.io.IO[builtins.str]]]"
+    reveal_type(partition(x))  # N: Revealed type is "tuple[list[returns.io.IO[int]], list[returns.io.IO[str]]]"
 
 
 - case: partition_maybe
@@ -30,4 +30,4 @@
 
     x: list[Maybe[int]]
 
-    reveal_type(partition(x))  # N: Revealed type is "tuple[builtins.list[builtins.int], builtins.list[None]]"
+    reveal_type(partition(x))  # N: Revealed type is "tuple[list[int], list[None]]"
diff --git a/typesafety/test_methods/test_unwrap_or_failure.yml b/typesafety/test_methods/test_unwrap_or_failure.yml
index 64406fd7c..095680cef 100644
--- a/typesafety/test_methods/test_unwrap_or_failure.yml
+++ b/typesafety/test_methods/test_unwrap_or_failure.yml
@@ -5,7 +5,7 @@
     from returns.result import Result
 
     x: Result[int, str]
-    reveal_type(unwrap_or_failure(x))  # N: Revealed type is "builtins.int | builtins.str"
+    reveal_type(unwrap_or_failure(x))  # N: Revealed type is "int | str"
 
 
 - case: unwrap_or_failure_ioresult
@@ -15,7 +15,7 @@
     from returns.io import IOResult
 
     x: IOResult[int, str]
-    reveal_type(unwrap_or_failure(x))  # N: Revealed type is "returns.io.IO[builtins.int] | returns.io.IO[builtins.str]"
+    reveal_type(unwrap_or_failure(x))  # N: Revealed type is "returns.io.IO[int] | returns.io.IO[str]"
 
 
 - case: unwrap_or_failure_custom_type
@@ -32,4 +32,4 @@
         ...
 
     x: MyOwn[int, str]
-    reveal_type(unwrap_or_failure(x))  # N: Revealed type is "builtins.int | builtins.str"
+    reveal_type(unwrap_or_failure(x))  # N: Revealed type is "int | str"
diff --git a/typesafety/test_pipeline/test_flow/test_flow_args.yml b/typesafety/test_pipeline/test_flow/test_flow_args.yml
index 12dbe437f..e996fb647 100644
--- a/typesafety/test_pipeline/test_flow/test_flow_args.yml
+++ b/typesafety/test_pipeline/test_flow/test_flow_args.yml
@@ -27,7 +27,7 @@
     from returns.functions import identity
 
     reveal_type(
-        flow(  # N: Revealed type is "builtins.int"
+        flow(  # N: Revealed type is "int"
             1,
             identity,
             identity,
diff --git a/typesafety/test_pipeline/test_flow/test_flow_base.yml b/typesafety/test_pipeline/test_flow/test_flow_base.yml
index f3deb515d..603c4dd28 100644
--- a/typesafety/test_pipeline/test_flow/test_flow_base.yml
+++ b/typesafety/test_pipeline/test_flow/test_flow_base.yml
@@ -6,7 +6,7 @@
     def inc(arg: int) -> int:
         ...
 
-    reveal_type(flow(1, inc, inc, inc, inc, inc))  # N: Revealed type is "builtins.int"
+    reveal_type(flow(1, inc, inc, inc, inc, inc))  # N: Revealed type is "int"
 
 
 - case: flow_function_with_overloads1
@@ -17,7 +17,7 @@
     def convert(arg: str) -> float:
         ...
 
-    reveal_type(flow('1.0', convert, int, bool))  # N: Revealed type is "builtins.bool"
+    reveal_type(flow('1.0', convert, int, bool))  # N: Revealed type is "bool"
 
 
 - case: flow_function_with_overloads2
@@ -29,7 +29,7 @@
     def convert(arg: str) -> float:
         ...
 
-    reveal_type(flow('1.0', identity, convert, identity, int, identity, bool, identity))  # N: Revealed type is "builtins.bool"
+    reveal_type(flow('1.0', identity, convert, identity, int, identity, bool, identity))  # N: Revealed type is "bool"
 
 
 - case: flow_with_object1
@@ -41,7 +41,7 @@
         def __call__(self, arg: int) -> float:
             ...
 
-    reveal_type(flow(1, Test()))  # N: Revealed type is "builtins.float"
+    reveal_type(flow(1, Test()))  # N: Revealed type is "float"
 
 
 - case: flow_with_object2
@@ -62,7 +62,7 @@
     from returns.pipeline import flow
 
     reveal_type(
-        flow(  # N: Revealed type is "builtins.float"
+        flow(  # N: Revealed type is "float"
             1,
             lambda x: x,
             str,
@@ -92,7 +92,7 @@
             ...
 
     reveal_type(
-        flow(  # N: Revealed type is "builtins.int"
+        flow(  # N: Revealed type is "int"
             1,
             Test().method,
             Test.method_class,
@@ -129,7 +129,7 @@
     def mappable(arg: float) -> bool:
         ...
 
-    reveal_type(flow(x, bind(bound), identity, map_(mappable)))  # N: Revealed type is "returns.result.Result[builtins.bool, builtins.str]"
+    reveal_type(flow(x, bind(bound), identity, map_(mappable)))  # N: Revealed type is "returns.result.Result[bool, str]"
 
 
 - case: bind_result_and_flow1
@@ -148,7 +148,7 @@
         ...
 
     r: IOResult[int, str]
-    reveal_type(flow(r, identity, bind_result(test), bind_result(second)))  # N: Revealed type is "returns.io.IOResult[builtins.bool, builtins.str]"
+    reveal_type(flow(r, identity, bind_result(test), bind_result(second)))  # N: Revealed type is "returns.io.IOResult[bool, str]"
 
 
 - case: bind_result_and_flow2
@@ -167,7 +167,7 @@
         ...
 
     r: IOResult[int, str]
-    reveal_type(flow(r, bind_result(test), identity, bind_result(second)))  # N: Revealed type is "returns.io.IOResult[builtins.bool, builtins.str]"
+    reveal_type(flow(r, bind_result(test), identity, bind_result(second)))  # N: Revealed type is "returns.io.IOResult[bool, str]"
 
 
 - case: bind_result_and_flow3
@@ -186,4 +186,4 @@
         ...
 
     r: IOResult[int, str]
-    reveal_type(flow(r, bind_result(test), bind_result(second)))  # N: Revealed type is "returns.io.IOResult[builtins.bool, builtins.str]"
+    reveal_type(flow(r, bind_result(test), bind_result(second)))  # N: Revealed type is "returns.io.IOResult[bool, str]"
diff --git a/typesafety/test_pipeline/test_flow/test_flow_curry.yml b/typesafety/test_pipeline/test_flow/test_flow_curry.yml
index b58f68737..f548d603c 100644
--- a/typesafety/test_pipeline/test_flow/test_flow_curry.yml
+++ b/typesafety/test_pipeline/test_flow/test_flow_curry.yml
@@ -9,7 +9,7 @@
     def curried(a: int, b: int) -> float:
         ...
 
-    reveal_type(flow(1, curried)(1))  # N: Revealed type is "builtins.float"
+    reveal_type(flow(1, curried)(1))  # N: Revealed type is "float"
 
 
 - case: flow_function_with_curried2
@@ -23,4 +23,4 @@
     def curried(a: int, b: int) -> float:
         ...
 
-    reveal_type(flow(1, curried, identity)(1))  # N: Revealed type is "builtins.float"
+    reveal_type(flow(1, curried, identity)(1))  # N: Revealed type is "float"
diff --git a/typesafety/test_pipeline/test_flow/test_flow_errors.yml b/typesafety/test_pipeline/test_flow/test_flow_errors.yml
index acc379ee9..5a3564b9b 100644
--- a/typesafety/test_pipeline/test_flow/test_flow_errors.yml
+++ b/typesafety/test_pipeline/test_flow/test_flow_errors.yml
@@ -9,7 +9,7 @@
     reveal_type(flow('1', int, convert))
   out: |
     main:6: error: Argument 1 to "convert" has incompatible type "int"; expected "str"  [arg-type]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
 
 
 - case: flow_wrong_steps_error
@@ -20,7 +20,7 @@
     reveal_type(flow('a', [], int))
   out: |
     main:3: error: "list[Never]" not callable  [operator]
-    main:3: note: Revealed type is "builtins.int"
+    main:3: note: Revealed type is "int"
 
 
 - case: flow_function_first_arg_error
@@ -34,7 +34,7 @@
     reveal_type(flow(1, convert))
   out: |
     main:6: error: Argument 1 to "convert" has incompatible type "int"; expected "str"  [arg-type]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
 
 
 - case: flow_function_without_args_error
@@ -48,7 +48,7 @@
     reveal_type(flow(1, convert))
   out: |
     main:6: error: Too many arguments for "convert"  [call-arg]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
 
 
 - case: flow_function_with_too_many_args_error
@@ -63,4 +63,4 @@
   out: |
     main:6: error: Missing positional argument "other" in call to "convert"  [call-arg]
     main:6: error: Argument 1 to "convert" has incompatible type "int"; expected "str"  [arg-type]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
diff --git a/typesafety/test_pipeline/test_flow/test_flow_generics.yml b/typesafety/test_pipeline/test_flow/test_flow_generics.yml
index 50d6b9baf..263bbf072 100644
--- a/typesafety/test_pipeline/test_flow/test_flow_generics.yml
+++ b/typesafety/test_pipeline/test_flow/test_flow_generics.yml
@@ -9,7 +9,7 @@
 
     def test(arg: _NewValueType) -> _NewValueType:
         x = flow(arg, identity)
-        reveal_type(x)  # N: Revealed type is "_NewValueType`-1"
+        reveal_type(x)  # N: Revealed type is "_NewValueType"
         return x
 
 
@@ -24,5 +24,5 @@
 
     def test(arg: _NewValueType) -> _NewValueType:
         x = flow(arg, str)
-        reveal_type(x)  # N: Revealed type is "builtins.str"
+        reveal_type(x)  # N: Revealed type is "str"
         return arg
diff --git a/typesafety/test_pipeline/test_is_successful.yml b/typesafety/test_pipeline/test_is_successful.yml
index f8ba52fd5..04911f550 100644
--- a/typesafety/test_pipeline/test_is_successful.yml
+++ b/typesafety/test_pipeline/test_is_successful.yml
@@ -7,7 +7,7 @@
     def returns_result() -> Result[int, str]:
         ...
 
-    reveal_type(is_successful(returns_result()))  # N: Revealed type is "builtins.bool"
+    reveal_type(is_successful(returns_result()))  # N: Revealed type is "bool"
 
 
 - case: ioresult_is_successful
@@ -19,7 +19,7 @@
     def returns_ioresult() -> IOResult[int, str]:
         ...
 
-    reveal_type(is_successful(returns_ioresult()))  # N: Revealed type is "builtins.bool"
+    reveal_type(is_successful(returns_ioresult()))  # N: Revealed type is "bool"
 
 
 - case: maybe_is_successful
@@ -28,7 +28,7 @@
     from returns.pipeline import is_successful
     from returns.maybe import Maybe
 
-    reveal_type(is_successful(Maybe.from_value(1)))  # N: Revealed type is "builtins.bool"
+    reveal_type(is_successful(Maybe.from_value(1)))  # N: Revealed type is "bool"
 
 
 - case: custom_type_is_successful
@@ -62,6 +62,6 @@
             return self.error
 
     x: MyOwn[int, str]
-    reveal_type(x.unwrap())  # N: Revealed type is "builtins.int"
-    reveal_type(x.failure())  # N: Revealed type is "builtins.str"
-    reveal_type(is_successful(x))  # N: Revealed type is "builtins.bool"
+    reveal_type(x.unwrap())  # N: Revealed type is "int"
+    reveal_type(x.failure())  # N: Revealed type is "str"
+    reveal_type(is_successful(x))  # N: Revealed type is "bool"
diff --git a/typesafety/test_pipeline/test_managed/test_managed_types.yml b/typesafety/test_pipeline/test_managed/test_managed_types.yml
index 94c6e5b4d..39a9fbb9d 100644
--- a/typesafety/test_pipeline/test_managed/test_managed_types.yml
+++ b/typesafety/test_pipeline/test_managed/test_managed_types.yml
@@ -15,7 +15,7 @@
         ...
 
     x: IOResult[int, str]
-    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.io.IOResult[builtins.float, builtins.str]"
+    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.io.IOResult[float, str]"
 
 
 - case: managed_with_future_result
@@ -35,7 +35,7 @@
         ...
 
     x: FutureResult[int, str]
-    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.float, builtins.str]"
+    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.future.FutureResult[float, str]"
 
 
 - case: managed_with_reader_ioresult
@@ -55,7 +55,7 @@
         ...
 
     x: ReaderIOResult[int, str, bool]
-    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.str, builtins.bool]"
+    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[float, str, bool]"
 
 
 - case: managed_with_reader_future_result
@@ -75,7 +75,7 @@
         ...
 
     x: ReaderFutureResult[int, str, bool]
-    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.float, builtins.str, builtins.bool]"
+    reveal_type(managed(use, release)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[float, str, bool]"
 
 
 - case: managed_custom_type
@@ -130,4 +130,4 @@
         ...
 
     x: MyClass[int, str]
-    reveal_type(managed(use, release)(x))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(managed(use, release)(x))  # N: Revealed type is "main.MyClass[float, str]"
diff --git a/typesafety/test_pipeline/test_pipe/test_pipe_base.yml b/typesafety/test_pipeline/test_pipe/test_pipe_base.yml
index 9c577811b..a340d3228 100644
--- a/typesafety/test_pipeline/test_pipe/test_pipe_base.yml
+++ b/typesafety/test_pipeline/test_pipe/test_pipe_base.yml
@@ -7,7 +7,7 @@
         ...
 
     predefined = pipe(convert, int, bool)
-    reveal_type(predefined('1.0'))  # N: Revealed type is "builtins.bool"
+    reveal_type(predefined('1.0'))  # N: Revealed type is "bool"
 
 
 - case: pipe_function2
@@ -20,7 +20,7 @@
         ...
 
     predefined = pipe(identity, convert, identity, identity, int, identity, bool, identity)
-    reveal_type(predefined('1.0'))  # N: Revealed type is "builtins.bool"
+    reveal_type(predefined('1.0'))  # N: Revealed type is "bool"
 
 
 - case: pipe_callable_instances
@@ -42,7 +42,7 @@
         ...
 
     predefined = pipe(Test, with_instance, convert, Test(1))
-    reveal_type(predefined(1))  # N: Revealed type is "builtins.bool"
+    reveal_type(predefined(1))  # N: Revealed type is "bool"
 
 
 - case: pipe_star_args
@@ -52,7 +52,7 @@
     from returns.functions import identity
 
     reveal_type(
-        pipe(  # N: Revealed type is "builtins.int"
+        pipe(  # N: Revealed type is "int"
             identity,
             identity,
             identity,
@@ -78,7 +78,7 @@
     from returns.pipeline import pipe
 
     reveal_type(
-        pipe(  # N: Revealed type is "builtins.float"
+        pipe(  # N: Revealed type is "float"
             lambda x: x,
             str,
             lambda y: y.split(' '),
@@ -107,7 +107,7 @@
             ...
 
     reveal_type(
-        pipe(  # N: Revealed type is "builtins.int"
+        pipe(  # N: Revealed type is "int"
             Test().method,
             Test.method_class,
             Test.method_static,
@@ -133,8 +133,8 @@
     from returns.pipeline import pipe
 
     x = pipe(int, str, int)
-    reveal_type(x(1.0))  # N: Revealed type is "builtins.int"
-    reveal_type(x('a'))  # N: Revealed type is "builtins.int"
+    reveal_type(x(1.0))  # N: Revealed type is "int"
+    reveal_type(x('a'))  # N: Revealed type is "int"
 
 
 - case: pipe_with_containers
@@ -153,7 +153,7 @@
     def mappable(arg: float) -> bool:
         ...
 
-    reveal_type(pipe(bind(bound), identity, map_(mappable))(x))  # N: Revealed type is "returns.result.Result[builtins.bool, builtins.str]"
+    reveal_type(pipe(bind(bound), identity, map_(mappable))(x))  # N: Revealed type is "returns.result.Result[bool, str]"
 
 
 - case: pipe_with_containers2
@@ -172,4 +172,4 @@
         ...
 
     r: IOResult[int, str]
-    reveal_type(pipe(bind_result(test), bind_result(second))(r))  # N: Revealed type is "returns.io.IOResult[builtins.bool, builtins.str]"
+    reveal_type(pipe(bind_result(test), bind_result(second))(r))  # N: Revealed type is "returns.io.IOResult[bool, str]"
diff --git a/typesafety/test_pipeline/test_pipe/test_pipe_callable_protocol.yml b/typesafety/test_pipeline/test_pipe/test_pipe_callable_protocol.yml
index d96ccc39c..35dfcb2e8 100644
--- a/typesafety/test_pipeline/test_pipe/test_pipe_callable_protocol.yml
+++ b/typesafety/test_pipeline/test_pipe/test_pipe_callable_protocol.yml
@@ -11,7 +11,7 @@
         return f('a')
 
     predefined = pipe(convert, int, bool)
-    reveal_type(callback(predefined))  # N: Revealed type is "builtins.bool"
+    reveal_type(callback(predefined))  # N: Revealed type is "bool"
 
 
 - case: pipe_generic_callable1
@@ -33,7 +33,7 @@
         ...
 
     predefined = pipe(first, second)
-    reveal_type(callback(predefined, 1))  # N: Revealed type is "builtins.str"
+    reveal_type(callback(predefined, 1))  # N: Revealed type is "str"
 
 
 - case: pipe_generic_callable2
@@ -55,4 +55,4 @@
         ...
 
     predefined = pipe(first, second)
-    reveal_type(callback(predefined))  # N: Revealed type is "builtins.str"
+    reveal_type(callback(predefined))  # N: Revealed type is "str"
diff --git a/typesafety/test_pipeline/test_pipe/test_pipe_curry.yml b/typesafety/test_pipeline/test_pipe/test_pipe_curry.yml
index 22d7f69ae..0e25b4534 100644
--- a/typesafety/test_pipeline/test_pipe/test_pipe_curry.yml
+++ b/typesafety/test_pipeline/test_pipe/test_pipe_curry.yml
@@ -9,4 +9,4 @@
     def curried(a: int, b: int) -> float:
         ...
 
-    reveal_type(pipe(curried, identity)(1)(2))  # N: Revealed type is "builtins.float"
+    reveal_type(pipe(curried, identity)(1)(2))  # N: Revealed type is "float"
diff --git a/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml b/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml
index 00c006137..d78449adf 100644
--- a/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml
+++ b/typesafety/test_pipeline/test_pipe/test_pipe_errors.yml
@@ -9,7 +9,7 @@
     reveal_type(pipe(int, convert)('a'))
   out: |
     main:6: error: Argument 1 to "convert" has incompatible type "int"; expected "str"  [arg-type]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
 
 
 - case: pipe_wrong_steps_error
@@ -44,7 +44,7 @@
     reveal_type(pipe(convert)(1))
   out: |
     main:6: error: Argument 1 to "convert" has incompatible type "int"; expected "str"  [arg-type]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
     main:6: error: Argument 1 to "__call__" of "_Pipe" has incompatible type "int"; expected "str"  [arg-type]
 
 
@@ -59,7 +59,7 @@
     reveal_type(pipe(convert)(1))
   out: |
     main:6: error: Too many arguments for "convert"  [call-arg]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
 
 
 - case: pipe_function_with_too_many_args_error
@@ -74,5 +74,5 @@
   out: |
     main:6: error: Missing positional argument "other" in call to "convert"  [call-arg]
     main:6: error: Argument 1 to "convert" has incompatible type "int"; expected "str"  [arg-type]
-    main:6: note: Revealed type is "builtins.float"
+    main:6: note: Revealed type is "float"
     main:6: error: Argument 1 to "__call__" of "_Pipe" has incompatible type "int"; expected "str"  [arg-type]
diff --git a/typesafety/test_pipeline/test_pipe/test_pipe_generic.yml b/typesafety/test_pipeline/test_pipe/test_pipe_generic.yml
index cc2fbdffd..aeeb79fa8 100644
--- a/typesafety/test_pipeline/test_pipe/test_pipe_generic.yml
+++ b/typesafety/test_pipeline/test_pipe/test_pipe_generic.yml
@@ -9,7 +9,7 @@
 
     def test(arg: _NewValueType) -> _NewValueType:
         x = pipe(identity)(arg)
-        reveal_type(x)  # N: Revealed type is "_NewValueType`-1"
+        reveal_type(x)  # N: Revealed type is "_NewValueType"
         return x
 
 
@@ -24,5 +24,5 @@
 
     def test(arg: _NewValueType) -> _NewValueType:
         x = pipe(identity, str)(arg)
-        reveal_type(x)  # N: Revealed type is "builtins.str"
+        reveal_type(x)  # N: Revealed type is "str"
         return arg
diff --git a/typesafety/test_pointfree/test_alt.yml b/typesafety/test_pointfree/test_alt.yml
index 226e34cdd..2fa87d89d 100644
--- a/typesafety/test_pointfree/test_alt.yml
+++ b/typesafety/test_pointfree/test_alt.yml
@@ -12,7 +12,7 @@
         ...
 
     r: Result[str, int]
-    reveal_type(flow(r, alt(test), alt(stringify)))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.str]"
+    reveal_type(flow(r, alt(test), alt(stringify)))  # N: Revealed type is "returns.result.Result[str, str]"
 
 
 - case: alt_result
@@ -25,7 +25,7 @@
         ...
 
     x: Result[str, float]
-    reveal_type(alt(test)(x))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.int]"
+    reveal_type(alt(test)(x))  # N: Revealed type is "returns.result.Result[str, int]"
 
 
 - case: alt_ioresult
@@ -38,7 +38,7 @@
         ...
 
     x: IOResult[str, float]
-    reveal_type(alt(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.int]"
+    reveal_type(alt(test)(x))  # N: Revealed type is "returns.io.IOResult[str, int]"
 
 
 - case: alt_requires_context_result
@@ -51,7 +51,7 @@
         ...
 
     x: RequiresContextResult[str, float, bool]
-    reveal_type(alt(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.str, builtins.int, builtins.bool]"
+    reveal_type(alt(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[str, int, bool]"
 
 
 - case: alt_requires_context_ioresult
@@ -64,7 +64,7 @@
         ...
 
     x: RequiresContextIOResult[str, float, bool]
-    reveal_type(alt(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.str, builtins.int, builtins.bool]"
+    reveal_type(alt(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[str, int, bool]"
 
 
 - case: alt_requires_context_future_result
@@ -77,7 +77,7 @@
         ...
 
     x: RequiresContextFutureResult[str, float, bool]
-    reveal_type(alt(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.str, builtins.int, builtins.bool]"
+    reveal_type(alt(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[str, int, bool]"
 
 
 - case: alt_future_result
@@ -90,7 +90,7 @@
         ...
 
     x: FutureResult[str, float]
-    reveal_type(alt(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.str, builtins.int]"
+    reveal_type(alt(test)(x))  # N: Revealed type is "returns.future.FutureResult[str, int]"
 
 
 - case: alt_custom_type
@@ -114,4 +114,4 @@
         ...
 
     x: MyOwn[str, float]
-    reveal_type(alt(test)(x))  # N: Revealed type is "main.MyOwn[builtins.str, builtins.int]"
+    reveal_type(alt(test)(x))  # N: Revealed type is "main.MyOwn[str, int]"
diff --git a/typesafety/test_pointfree/test_apply.yml b/typesafety/test_pointfree/test_apply.yml
index a7c23c283..1bf4967d8 100644
--- a/typesafety/test_pointfree/test_apply.yml
+++ b/typesafety/test_pointfree/test_apply.yml
@@ -9,7 +9,7 @@
     test: Result[Callable[[float], int], str]
     x: Result[float, str]
 
-    reveal_type(flow(test, x.apply))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(flow(test, x.apply))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: apply_wrong_extra_types
@@ -48,7 +48,7 @@
         ...
 
     x: IO[float]
-    reveal_type(apply(IO(test))(x))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(apply(IO(test))(x))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: apply_maybe
@@ -61,7 +61,7 @@
         ...
 
     x: Maybe[float]
-    reveal_type(apply(Maybe.from_value(test))(x))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(apply(Maybe.from_value(test))(x))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: apply_result
@@ -74,7 +74,7 @@
     test: Result[Callable[[float], int], str]
     x: Result[float, str]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: apply_ioresult
@@ -87,7 +87,7 @@
     test: IOResult[Callable[[float], int], str]
     x: IOResult[float, str]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: apply_requires_context
@@ -100,7 +100,7 @@
     test: RequiresContext[Callable[[float], int], bool]
     x: RequiresContext[float, bool]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, builtins.bool]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[int, bool]"
 
 
 - case: apply_requires_context_result
@@ -113,7 +113,7 @@
     test: RequiresContextResult[Callable[[float], int], str, bool]
     x: RequiresContextResult[float, str, bool]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, str, bool]"
 
 
 - case: apply_requires_context_ioresult
@@ -126,7 +126,7 @@
     test: RequiresContextIOResult[Callable[[float], int], str, bool]
     x: RequiresContextIOResult[float, str, bool]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
 
 
 - case: apply_requires_context_future_result
@@ -139,7 +139,7 @@
     test: RequiresContextFutureResult[Callable[[float], int], str, bool]
     x: RequiresContextFutureResult[float, str, bool]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
 
 
 - case: apply_future
@@ -152,7 +152,7 @@
         ...
 
     x: Future[float]
-    reveal_type(apply(Future.from_value(test))(x))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(apply(Future.from_value(test))(x))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: apply_future_result
@@ -165,7 +165,7 @@
     test: FutureResult[Callable[[float], int], str]
     x: FutureResult[float, str]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: apply_custom_type
@@ -185,4 +185,4 @@
     test: MyClass[Callable[[float], int]]
     x: MyClass[float]
 
-    reveal_type(apply(test)(x))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(apply(test)(x))  # N: Revealed type is "main.MyClass[int]"
diff --git a/typesafety/test_pointfree/test_bimap.yml b/typesafety/test_pointfree/test_bimap.yml
index 0d7c77f7e..6930a91e4 100644
--- a/typesafety/test_pointfree/test_bimap.yml
+++ b/typesafety/test_pointfree/test_bimap.yml
@@ -12,7 +12,7 @@
         ...
 
     r: Result[float, int]
-    reveal_type(flow(r, bimap(first, second)))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.str]"
+    reveal_type(flow(r, bimap(first, second)))  # N: Revealed type is "returns.result.Result[str, str]"
 
 
 - case: bimap_result
@@ -28,7 +28,7 @@
         ...
 
     x: Result[float, int]
-    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.str]"
+    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.result.Result[str, str]"
 
 
 - case: bimap_ioresult
@@ -44,7 +44,7 @@
         ...
 
     x: IOResult[float, int]
-    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.str]"
+    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.io.IOResult[str, str]"
 
 
 - case: bimap_requires_context_result
@@ -60,7 +60,7 @@
         ...
 
     x: RequiresContextResult[float, int, bool]
-    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.str, builtins.str, builtins.bool]"
+    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[str, str, bool]"
 
 
 - case: bimap_requires_context_ioresult
@@ -76,7 +76,7 @@
         ...
 
     x: RequiresContextIOResult[float, int, bool]
-    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.str, builtins.str, builtins.bool]"
+    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[str, str, bool]"
 
 
 - case: bimap_requires_context_future_result
@@ -92,7 +92,7 @@
         ...
 
     x: RequiresContextFutureResult[float, int, bool]
-    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.str, builtins.str, builtins.bool]"
+    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[str, str, bool]"
 
 
 - case: bimap_future_result
@@ -108,7 +108,7 @@
         ...
 
     x: FutureResult[float, int]
-    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.str, builtins.str]"
+    reveal_type(bimap(first, second)(x))  # N: Revealed type is "returns.future.FutureResult[str, str]"
 
 
 - case: bimap_custom_type
@@ -135,4 +135,4 @@
         ...
 
     x: MyOwn[float, int]
-    reveal_type(bimap(first, second)(x))  # N: Revealed type is "main.MyOwn[builtins.str, builtins.str]"
+    reveal_type(bimap(first, second)(x))  # N: Revealed type is "main.MyOwn[str, str]"
diff --git a/typesafety/test_pointfree/test_bind.yml b/typesafety/test_pointfree/test_bind.yml
index cd8f85d72..31a262b59 100644
--- a/typesafety/test_pointfree/test_bind.yml
+++ b/typesafety/test_pointfree/test_bind.yml
@@ -56,7 +56,7 @@
         ...
 
     x: Result[float, str]
-    reveal_type(flow(x, bind(test)))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(flow(x, bind(test)))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: bind_io
@@ -69,7 +69,7 @@
         ...
 
     x: IO[float]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: bind_maybe
@@ -82,7 +82,7 @@
         ...
 
     x: Maybe[float]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: bind_result
@@ -95,7 +95,7 @@
         ...
 
     x: Result[float, str]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: bind_ioresult
@@ -108,7 +108,7 @@
         ...
 
     x: IOResult[float, str]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: bind_requires_context
@@ -121,7 +121,7 @@
         ...
 
     x: RequiresContext[float, str]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, builtins.str]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[int, str]"
 
 
 - case: bind_requires_context_result
@@ -134,7 +134,7 @@
         ...
 
     x: RequiresContextResult[float, bool, str]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, bool, str]"
 
 
 - case: bind_requires_context_ioresult
@@ -147,7 +147,7 @@
         ...
 
     x: RequiresContextIOResult[float, bool, str]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, bool, str]"
 
 
 - case: bind_requires_context_future_result
@@ -160,7 +160,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_future
@@ -173,7 +173,7 @@
         ...
 
     x: Future[float]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: bind_future_result
@@ -186,7 +186,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_custom_type
@@ -210,4 +210,4 @@
         ...
 
     x: MyOwn[float]
-    reveal_type(bind(test)(x))  # N: Revealed type is "main.MyOwn[builtins.int]"
+    reveal_type(bind(test)(x))  # N: Revealed type is "main.MyOwn[int]"
diff --git a/typesafety/test_pointfree/test_bind_async.yml b/typesafety/test_pointfree/test_bind_async.yml
index 30a0374b9..8c8791cc3 100644
--- a/typesafety/test_pointfree/test_bind_async.yml
+++ b/typesafety/test_pointfree/test_bind_async.yml
@@ -71,7 +71,7 @@
         ...
 
     x: Future[float]
-    reveal_type(flow(x, bind_async(test1), bind_async(test2)))  # N: Revealed type is "returns.future.Future[builtins.str]"
+    reveal_type(flow(x, bind_async(test1), bind_async(test2)))  # N: Revealed type is "returns.future.Future[str]"
 
 
 - case: bind_async_requires_context_future_result
@@ -84,7 +84,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind_async(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_async(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_async_future
@@ -97,7 +97,7 @@
         ...
 
     x: Future[float]
-    reveal_type(bind_async(test)(x))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(bind_async(test)(x))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: bind_async_future_result
@@ -110,7 +110,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_async(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_async(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_async_custom_type
@@ -133,4 +133,4 @@
         ...
 
     x: MyClass[float]
-    reveal_type(bind_async(test)(x))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(bind_async(test)(x))  # N: Revealed type is "main.MyClass[int]"
diff --git a/typesafety/test_pointfree/test_bind_async_context_future_result.yml b/typesafety/test_pointfree/test_bind_async_context_future_result.yml
index ba7e27ad5..1dd2d7a68 100644
--- a/typesafety/test_pointfree/test_bind_async_context_future_result.yml
+++ b/typesafety/test_pointfree/test_bind_async_context_future_result.yml
@@ -21,4 +21,4 @@
         ...
 
     x: RequiresContextFutureResult[float, str, bool]
-    reveal_type(bind_async_context_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_async_context_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
diff --git a/typesafety/test_pointfree/test_bind_async_future.yml b/typesafety/test_pointfree/test_bind_async_future.yml
index db51bc646..b8a566149 100644
--- a/typesafety/test_pointfree/test_bind_async_future.yml
+++ b/typesafety/test_pointfree/test_bind_async_future.yml
@@ -12,7 +12,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(flow(x, bind_async_future(test1), bind_async_future(test2)))  # N: Revealed type is "returns.future.FutureResult[builtins.str, builtins.str]"
+    reveal_type(flow(x, bind_async_future(test1), bind_async_future(test2)))  # N: Revealed type is "returns.future.FutureResult[str, str]"
 
 
 - case: bind_async_future_requires_context_future_result
@@ -26,7 +26,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_async_future_future
@@ -39,7 +39,7 @@
         ...
 
     x: Future[float]
-    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: bind_async_future_future_result
@@ -52,7 +52,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_async_future_custom_type
@@ -77,4 +77,4 @@
         ...
 
     x: MyClass[float]
-    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(bind_async_future(test)(x))  # N: Revealed type is "main.MyClass[int]"
diff --git a/typesafety/test_pointfree/test_bind_async_future_result.yml b/typesafety/test_pointfree/test_bind_async_future_result.yml
index 4d97566c2..28328303c 100644
--- a/typesafety/test_pointfree/test_bind_async_future_result.yml
+++ b/typesafety/test_pointfree/test_bind_async_future_result.yml
@@ -35,7 +35,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind_async_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_async_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_async_future_result_future_result
@@ -48,7 +48,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_async_future_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_async_future_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_async_future_result_custom_type
@@ -73,4 +73,4 @@
         ...
 
     x: MyClass[float, str]
-    reveal_type(bind_async_future_result(test)(x))  # N: Revealed type is "main.MyClass[builtins.int, builtins.str]"
+    reveal_type(bind_async_future_result(test)(x))  # N: Revealed type is "main.MyClass[int, str]"
diff --git a/typesafety/test_pointfree/test_bind_awaitable.yml b/typesafety/test_pointfree/test_bind_awaitable.yml
index ffdb5da8d..9a445cfe0 100644
--- a/typesafety/test_pointfree/test_bind_awaitable.yml
+++ b/typesafety/test_pointfree/test_bind_awaitable.yml
@@ -54,7 +54,7 @@
         ...
 
     x: Future[float]
-    reveal_type(flow(x, bind_awaitable(test1), bind_awaitable(test2)))  # N: Revealed type is "returns.future.Future[builtins.str]"
+    reveal_type(flow(x, bind_awaitable(test1), bind_awaitable(test2)))  # N: Revealed type is "returns.future.Future[str]"
 
 
 - case: bind_awaitable_requires_context_future_result
@@ -67,7 +67,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_awaitable_future
@@ -80,7 +80,7 @@
         ...
 
     x: Future[float]
-    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: bind_awaitable_future_result
@@ -93,7 +93,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_awaitable_custom_type
@@ -118,4 +118,4 @@
         ...
 
     x: MyClass[float]
-    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(bind_awaitable(test)(x))  # N: Revealed type is "main.MyClass[int]"
diff --git a/typesafety/test_pointfree/test_bind_context2.yml b/typesafety/test_pointfree/test_bind_context2.yml
index f149d81ae..b23247513 100644
--- a/typesafety/test_pointfree/test_bind_context2.yml
+++ b/typesafety/test_pointfree/test_bind_context2.yml
@@ -43,7 +43,7 @@
         ...
 
     r: RequiresContext[int, str]
-    reveal_type(flow(r, bind_context2(test), bind_context2(second)))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.bool, builtins.str]"
+    reveal_type(flow(r, bind_context2(test), bind_context2(second)))  # N: Revealed type is "returns.context.requires_context.RequiresContext[bool, str]"
 
 
 - case: bind_context2_requires_context
@@ -56,7 +56,7 @@
         ...
 
     x: RequiresContext[float, str]
-    reveal_type(bind_context2(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, builtins.str]"
+    reveal_type(bind_context2(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[int, str]"
 
 
 - case: bind_context2_custom_type
@@ -82,4 +82,4 @@
         ...
 
     x: MyClass[int, str]
-    reveal_type(bind_context2(test)(x))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(bind_context2(test)(x))  # N: Revealed type is "main.MyClass[float, str]"
diff --git a/typesafety/test_pointfree/test_bind_context3.yml b/typesafety/test_pointfree/test_bind_context3.yml
index 6afdf6c5c..32c8a7f89 100644
--- a/typesafety/test_pointfree/test_bind_context3.yml
+++ b/typesafety/test_pointfree/test_bind_context3.yml
@@ -38,7 +38,7 @@
         ...
 
     x: RequiresContextResult[float, Exception, str]
-    reveal_type(bind_context3(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.Exception, builtins.str]"
+    reveal_type(bind_context3(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, Exception, str]"
 
 
 - case: bind_context_and_flow
@@ -55,7 +55,7 @@
         ...
 
     r: RequiresContextResult[int, Exception, str]
-    reveal_type(flow(r, bind_context(test), bind_context(second)))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.bool, builtins.Exception, builtins.str]"
+    reveal_type(flow(r, bind_context(test), bind_context(second)))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[bool, Exception, str]"
 
 
 - case: bind_context_requires_context_result
@@ -68,7 +68,7 @@
         ...
 
     x: RequiresContextResult[float, Exception, str]
-    reveal_type(bind_context(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.Exception, builtins.str]"
+    reveal_type(bind_context(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, Exception, str]"
 
 
 - case: bind_context_requires_context_ioresult
@@ -81,7 +81,7 @@
         ...
 
     x: RequiresContextIOResult[float, Exception, str]
-    reveal_type(bind_context(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.Exception, builtins.str]"
+    reveal_type(bind_context(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, Exception, str]"
 
 
 - case: bind_context_requires_context_future_result
@@ -94,7 +94,7 @@
         ...
 
     x: RequiresContextFutureResult[float, Exception, str]
-    reveal_type(bind_context(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.Exception, builtins.str]"
+    reveal_type(bind_context(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, Exception, str]"
 
 
 - case: bind_context_custom_type
@@ -120,4 +120,4 @@
         ...
 
     x: MyClass[int, Exception, str]
-    reveal_type(bind_context(test)(x))  # N: Revealed type is "main.MyClass[builtins.float, builtins.Exception, builtins.str]"
+    reveal_type(bind_context(test)(x))  # N: Revealed type is "main.MyClass[float, Exception, str]"
diff --git a/typesafety/test_pointfree/test_bind_context_future_result.yml b/typesafety/test_pointfree/test_bind_context_future_result.yml
index e0420d413..54c6eb293 100644
--- a/typesafety/test_pointfree/test_bind_context_future_result.yml
+++ b/typesafety/test_pointfree/test_bind_context_future_result.yml
@@ -21,4 +21,4 @@
         ...
 
     x: RequiresContextFutureResult[float, str, bool]
-    reveal_type(bind_context_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_context_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
diff --git a/typesafety/test_pointfree/test_bind_context_ioresult.yml b/typesafety/test_pointfree/test_bind_context_ioresult.yml
index cbac0333b..3915d84af 100644
--- a/typesafety/test_pointfree/test_bind_context_ioresult.yml
+++ b/typesafety/test_pointfree/test_bind_context_ioresult.yml
@@ -21,7 +21,7 @@
         ...
 
     x: RequiresContextIOResult[float, str, bool]
-    reveal_type(bind_context_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_context_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
 
 
 - case: bind_context_ioresult_requires_context_future_result
@@ -34,4 +34,4 @@
         ...
 
     x: RequiresContextFutureResult[float, str, bool]
-    reveal_type(bind_context_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_context_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
diff --git a/typesafety/test_pointfree/test_bind_context_result.yml b/typesafety/test_pointfree/test_bind_context_result.yml
index e26d3392a..ec6732467 100644
--- a/typesafety/test_pointfree/test_bind_context_result.yml
+++ b/typesafety/test_pointfree/test_bind_context_result.yml
@@ -21,7 +21,7 @@
         ...
 
     x: RequiresContextResult[float, str, bool]
-    reveal_type(bind_context_result(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_context_result(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, str, bool]"
 
 
 - case: bind_context_result_requires_context_ioresult
@@ -34,7 +34,7 @@
         ...
 
     x: RequiresContextIOResult[float, str, bool]
-    reveal_type(bind_context_result(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_context_result(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
 
 
 - case: bind_context_result_requires_context_future_result
@@ -47,4 +47,4 @@
         ...
 
     x: RequiresContextFutureResult[float, str, bool]
-    reveal_type(bind_context_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_context_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
diff --git a/typesafety/test_pointfree/test_bind_future.yml b/typesafety/test_pointfree/test_bind_future.yml
index 379d6f3da..373fc2f21 100644
--- a/typesafety/test_pointfree/test_bind_future.yml
+++ b/typesafety/test_pointfree/test_bind_future.yml
@@ -12,7 +12,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(flow(x, bind_future(test1), bind_future(test2)))  # N: Revealed type is "returns.future.FutureResult[builtins.str, builtins.str]"
+    reveal_type(flow(x, bind_future(test1), bind_future(test2)))  # N: Revealed type is "returns.future.FutureResult[str, str]"
 
 
 - case: bind_future_wrong_function
@@ -39,7 +39,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind_future(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_future(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_future_future
@@ -52,7 +52,7 @@
         ...
 
     x: Future[float]
-    reveal_type(bind_future(test)(x))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(bind_future(test)(x))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: bind_future_future_result
@@ -65,7 +65,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_future(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_future(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_future_custom_type
@@ -89,4 +89,4 @@
         ...
 
     x: MyClass[float]
-    reveal_type(bind_future(test)(x))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(bind_future(test)(x))  # N: Revealed type is "main.MyClass[int]"
diff --git a/typesafety/test_pointfree/test_bind_future_result.yml b/typesafety/test_pointfree/test_bind_future_result.yml
index 94eea421c..e290ef93b 100644
--- a/typesafety/test_pointfree/test_bind_future_result.yml
+++ b/typesafety/test_pointfree/test_bind_future_result.yml
@@ -35,7 +35,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_future_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_future_result_future_result
@@ -48,7 +48,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_future_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_future_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_future_result_custom_type
@@ -73,4 +73,4 @@
         ...
 
     x: MyClass[float, str]
-    reveal_type(bind_future_result(test)(x))  # N: Revealed type is "main.MyClass[builtins.int, builtins.str]"
+    reveal_type(bind_future_result(test)(x))  # N: Revealed type is "main.MyClass[int, str]"
diff --git a/typesafety/test_pointfree/test_bind_io.yml b/typesafety/test_pointfree/test_bind_io.yml
index 884adec03..89be44448 100644
--- a/typesafety/test_pointfree/test_bind_io.yml
+++ b/typesafety/test_pointfree/test_bind_io.yml
@@ -26,7 +26,7 @@
         ...
 
     x: IO[float]
-    reveal_type(flow(x, bind_io(test)))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(flow(x, bind_io(test)))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: bind_io_wrong_instance_type
@@ -71,7 +71,7 @@
         ...
 
     x: IO[float]
-    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: bind_io_ioresult
@@ -84,7 +84,7 @@
         ...
 
     x: IOResult[float, str]
-    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: bind_io_requires_context_ioresult
@@ -98,7 +98,7 @@
         ...
 
     x: RequiresContextIOResult[float, bool, str]
-    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, bool, str]"
 
 
 - case: bind_io_requires_context_future_result
@@ -112,7 +112,7 @@
         ...
 
     x: RequiresContextFutureResult[float, bool, str]
-    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.bool, builtins.str]"
+    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, bool, str]"
 
 
 - case: bind_io_future
@@ -126,7 +126,7 @@
         ...
 
     x: Future[float]
-    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: bind_io_future_result
@@ -140,7 +140,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_io(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_io_custom_type
@@ -164,4 +164,4 @@
         ...
 
     x: MyClass[float]
-    reveal_type(bind_io(test)(x))  # N: Revealed type is "main.MyClass[builtins.int]"
+    reveal_type(bind_io(test)(x))  # N: Revealed type is "main.MyClass[int]"
diff --git a/typesafety/test_pointfree/test_bind_ioresult.yml b/typesafety/test_pointfree/test_bind_ioresult.yml
index dc329412b..30993104e 100644
--- a/typesafety/test_pointfree/test_bind_ioresult.yml
+++ b/typesafety/test_pointfree/test_bind_ioresult.yml
@@ -14,7 +14,7 @@
         ...
 
     r: FutureResult[int, str]
-    reveal_type(flow(r, bind_ioresult(test), bind_ioresult(second)))  # N: Revealed type is "returns.future.FutureResult[builtins.bool, builtins.str]"
+    reveal_type(flow(r, bind_ioresult(test), bind_ioresult(second)))  # N: Revealed type is "returns.future.FutureResult[bool, str]"
 
 
 - case: bind_ioresult_wrong_first_type
@@ -69,7 +69,7 @@
         ...
 
     x: IOResult[float, str]
-    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: bind_ioresult_requires_context_ioresult
@@ -83,7 +83,7 @@
         ...
 
     x: RequiresContextIOResult[float, str, bool]
-    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
 
 
 - case: bind_ioresult_requires_context_future_result
@@ -97,7 +97,7 @@
         ...
 
     x: RequiresContextFutureResult[float, str, bool]
-    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
 
 
 - case: bind_ioresult_future_result
@@ -111,7 +111,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_ioresult_custom_type
@@ -136,4 +136,4 @@
         ...
 
     x: MyClass[int, str]
-    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(bind_ioresult(test)(x))  # N: Revealed type is "main.MyClass[float, str]"
diff --git a/typesafety/test_pointfree/test_bind_optional.yml b/typesafety/test_pointfree/test_bind_optional.yml
index 1f46dbea5..29dc44390 100644
--- a/typesafety/test_pointfree/test_bind_optional.yml
+++ b/typesafety/test_pointfree/test_bind_optional.yml
@@ -25,4 +25,4 @@
         ...
 
     x: Maybe[float]
-    reveal_type(bind_optional(test)(x))  # N: Revealed type is "returns.maybe.Maybe[builtins.str]"
+    reveal_type(bind_optional(test)(x))  # N: Revealed type is "returns.maybe.Maybe[str]"
diff --git a/typesafety/test_pointfree/test_bind_result.yml b/typesafety/test_pointfree/test_bind_result.yml
index 64f67a255..9bc64883c 100644
--- a/typesafety/test_pointfree/test_bind_result.yml
+++ b/typesafety/test_pointfree/test_bind_result.yml
@@ -14,7 +14,7 @@
         ...
 
     r: IOResult[int, str]
-    reveal_type(flow(r, bind_result(test), bind_result(second)))  # N: Revealed type is "returns.io.IOResult[builtins.bool, builtins.str]"
+    reveal_type(flow(r, bind_result(test), bind_result(second)))  # N: Revealed type is "returns.io.IOResult[bool, str]"
 
 
 - case: bind_result_wrong_first_type
@@ -55,7 +55,7 @@
         ...
 
     x: Result[float, str]
-    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: bind_result_ioresult
@@ -69,7 +69,7 @@
         ...
 
     x: IOResult[float, str]
-    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: bind_result_requires_context_result
@@ -83,7 +83,7 @@
         ...
 
     x: RequiresContextResult[float, str, bool]
-    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, str, bool]"
 
 
 - case: bind_result_requires_context_ioresult
@@ -97,7 +97,7 @@
         ...
 
     x: RequiresContextIOResult[float, str, bool]
-    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
 
 
 - case: bind_result_requires_context_future_result
@@ -111,7 +111,7 @@
         ...
 
     x: RequiresContextFutureResult[float, str, bool]
-    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
 
 
 - case: bind_result_future_result
@@ -125,7 +125,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(bind_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: bind_result_custom_type
@@ -150,4 +150,4 @@
         ...
 
     x: MyClass[int, str]
-    reveal_type(bind_result(test)(x))  # N: Revealed type is "main.MyClass[builtins.float, builtins.str]"
+    reveal_type(bind_result(test)(x))  # N: Revealed type is "main.MyClass[float, str]"
diff --git a/typesafety/test_pointfree/test_compose_result.yml b/typesafety/test_pointfree/test_compose_result.yml
index 3a8a24a8e..44b260f16 100644
--- a/typesafety/test_pointfree/test_compose_result.yml
+++ b/typesafety/test_pointfree/test_compose_result.yml
@@ -9,7 +9,7 @@
         ...
 
     x: IOResult[str, int]
-    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.float, builtins.int]"
+    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.io.IOResult[float, int]"
 
 
 - case: compose_result_requires_context_ioresult
@@ -23,7 +23,7 @@
         ...
 
     x: RequiresContextIOResult[str, bool, float]
-    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.bool, builtins.float]"
+    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, bool, float]"
 
 
 - case: compose_result_future
@@ -37,7 +37,7 @@
         ...
 
     x: FutureResult[str, float]
-    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.str, builtins.float]"
+    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.future.FutureResult[str, float]"
 
 
 - case: compose_result_requires_context_future_result
@@ -51,7 +51,7 @@
         ...
 
     x: RequiresContextFutureResult[str, float, NoDeps]
-    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.str, builtins.float, Any]"
+    reveal_type(compose_result(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[str, float, Any]"
 
 
 - case: compose_result_custom_type
@@ -77,4 +77,4 @@
         ...
 
     x: MyClass[str, float]
-    reveal_type(compose_result(test)(x))  # N: Revealed type is "main.MyClass[builtins.bool, builtins.float]"
+    reveal_type(compose_result(test)(x))  # N: Revealed type is "main.MyClass[bool, float]"
diff --git a/typesafety/test_pointfree/test_cond.yml b/typesafety/test_pointfree/test_cond.yml
index 921051187..89cecdac4 100644
--- a/typesafety/test_pointfree/test_cond.yml
+++ b/typesafety/test_pointfree/test_cond.yml
@@ -4,7 +4,7 @@
     from returns.pointfree import cond
     from returns.result import Result
 
-    reveal_type(cond(Result, 42, '42')(True))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(cond(Result, 42, '42')(True))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: cond_ioresult
@@ -13,7 +13,7 @@
     from returns.io import IOResult
     from returns.pointfree import cond
 
-    reveal_type(cond(IOResult, 'success', 'failure')(False))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.str]"
+    reveal_type(cond(IOResult, 'success', 'failure')(False))  # N: Revealed type is "returns.io.IOResult[str, str]"
 
 
 - case: cond_future_result
@@ -22,7 +22,7 @@
     from returns.future import FutureResult
     from returns.pointfree import cond
 
-    reveal_type(cond(FutureResult, True, False)(False))  # N: Revealed type is "returns.future.FutureResult[builtins.bool, builtins.bool]"
+    reveal_type(cond(FutureResult, True, False)(False))  # N: Revealed type is "returns.future.FutureResult[bool, bool]"
 
 
 - case: cond_reader_ioresult
@@ -31,7 +31,7 @@
     from returns.pointfree import cond
     from returns.context import ReaderIOResult
 
-    reveal_type(cond(ReaderIOResult, 1.0, False)(True))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.bool, Any]"
+    reveal_type(cond(ReaderIOResult, 1.0, False)(True))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[float, bool, Any]"
 
 
 - case: cond_reader_future_result
@@ -40,7 +40,7 @@
     from returns.pointfree import cond
     from returns.context import ReaderFutureResult
 
-    reveal_type(cond(ReaderFutureResult, 1, 1.0)(True))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.float, Any]"
+    reveal_type(cond(ReaderFutureResult, 1, 1.0)(True))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, float, Any]"
 
 
 - case: cond_maybe
@@ -49,7 +49,7 @@
     from returns.pointfree import cond
     from returns.maybe import Maybe
 
-    reveal_type(cond(Maybe, True)(False))  # N: Revealed type is "returns.maybe.Maybe[builtins.bool]"
+    reveal_type(cond(Maybe, True)(False))  # N: Revealed type is "returns.maybe.Maybe[bool]"
 
 
 - case: cond_custom_type
@@ -72,5 +72,5 @@
 
     reveal_type(cond(MyOwn, 'test', 1.0)(True))
   out: |
-    main:16: note: Revealed type is "main.MyOwn[builtins.str, builtins.float]"
+    main:16: note: Revealed type is "main.MyOwn[str, float]"
     main:16: error: Only concrete class can be given where "type[MyOwn[Any, Any]]" is expected  [type-abstract]
diff --git a/typesafety/test_pointfree/test_map.yml b/typesafety/test_pointfree/test_map.yml
index aea109c99..cc3a6b605 100644
--- a/typesafety/test_pointfree/test_map.yml
+++ b/typesafety/test_pointfree/test_map.yml
@@ -41,7 +41,7 @@
     def test(arg: int) -> float:
         return arg + 1.5
 
-    reveal_type(ensure_callback(map_(test), Maybe.from_value(1)))  # N: Revealed type is "returns.maybe.Maybe[builtins.float]"
+    reveal_type(ensure_callback(map_(test), Maybe.from_value(1)))  # N: Revealed type is "returns.maybe.Maybe[float]"
 
 
 - case: map_and_flow
@@ -59,7 +59,7 @@
         ...
 
     r: Result[int, str]
-    reveal_type(flow(r, map_(test), map_(stringify), identity))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.str]"
+    reveal_type(flow(r, map_(test), map_(stringify), identity))  # N: Revealed type is "returns.result.Result[str, str]"
 
 
 - case: map_and_bind
@@ -72,7 +72,7 @@
     def test(arg: int) -> Result[float, str]:
         ...
 
-    reveal_type(map_(bind(test))(IO(Success(1))))  # N: Revealed type is "returns.io.IO[returns.result.Result[builtins.float, builtins.str]]"
+    reveal_type(map_(bind(test))(IO(Success(1))))  # N: Revealed type is "returns.io.IO[returns.result.Result[float, str]]"
 
 
 - case: map_io
@@ -84,7 +84,7 @@
     def test(arg: float) -> int:
         ...
 
-    reveal_type(map_(test)(IO(1.5)))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(map_(test)(IO(1.5)))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: map_maybe
@@ -96,7 +96,7 @@
     def test(arg: float) -> int:
         ...
 
-    reveal_type(map_(test)(Maybe.from_value(1.5)))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(map_(test)(Maybe.from_value(1.5)))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: map_result
@@ -109,7 +109,7 @@
         ...
 
     x: Result[float, str]
-    reveal_type(map_(test)(x))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: map_ioresult
@@ -122,7 +122,7 @@
         ...
 
     x: IOResult[float, str]
-    reveal_type(map_(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: map_requires_context
@@ -135,7 +135,7 @@
         ...
 
     x: RequiresContext[float, str]
-    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.int, builtins.str]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[int, str]"
 
 
 - case: map_requires_context_result
@@ -148,7 +148,7 @@
         ...
 
     x: RequiresContextResult[float, str, bool]
-    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[int, str, bool]"
 
 
 - case: map_requires_context_ioresult
@@ -161,7 +161,7 @@
         ...
 
     x: RequiresContextIOResult[float, str, bool]
-    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
 
 
 - case: map_requires_context_future_result
@@ -174,7 +174,7 @@
         ...
 
     x: RequiresContextFutureResult[float, str, bool]
-    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str, bool]"
 
 
 - case: map_future
@@ -186,7 +186,7 @@
     def test(arg: float) -> int:
         ...
 
-    reveal_type(map_(test)(Future.from_value(1.5)))  # N: Revealed type is "returns.future.Future[builtins.int]"
+    reveal_type(map_(test)(Future.from_value(1.5)))  # N: Revealed type is "returns.future.Future[int]"
 
 
 - case: map_future_result
@@ -199,7 +199,7 @@
         ...
 
     x: FutureResult[float, str]
-    reveal_type(map_(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: map_custom_type
@@ -223,4 +223,4 @@
         ...
 
     x: MyOwn[float]
-    reveal_type(map_(test)(x))  # N: Revealed type is "main.MyOwn[builtins.int]"
+    reveal_type(map_(test)(x))  # N: Revealed type is "main.MyOwn[int]"
diff --git a/typesafety/test_pointfree/test_modify_env2.yml b/typesafety/test_pointfree/test_modify_env2.yml
index 8c6a97941..324f0ca9d 100644
--- a/typesafety/test_pointfree/test_modify_env2.yml
+++ b/typesafety/test_pointfree/test_modify_env2.yml
@@ -37,7 +37,7 @@
         ...
 
     r: RequiresContext[int, int]
-    reveal_type(flow(r, modify_env2(modify), bind(test)))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.float, builtins.str]"
+    reveal_type(flow(r, modify_env2(modify), bind(test)))  # N: Revealed type is "returns.context.requires_context.RequiresContext[float, str]"
 
 
 - case: modify_env2_requires_context
@@ -50,7 +50,7 @@
     def mod(arg: A) -> bool: ...
 
     x: RequiresContext[float, bool]
-    reveal_type(modify_env2(mod)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[builtins.float, main.A]"
+    reveal_type(modify_env2(mod)(x))  # N: Revealed type is "returns.context.requires_context.RequiresContext[float, main.A]"
 
 
 - case: modify_env2_custom_type
@@ -74,4 +74,4 @@
     def mod(arg: A) -> bool: ...
 
     x: MyClass[float, bool]
-    reveal_type(modify_env2(mod)(x))  # N: Revealed type is "main.MyClass[builtins.float, main.A]"
+    reveal_type(modify_env2(mod)(x))  # N: Revealed type is "main.MyClass[float, main.A]"
diff --git a/typesafety/test_pointfree/test_modify_env3.yml b/typesafety/test_pointfree/test_modify_env3.yml
index f10c44b83..9d58cf8b0 100644
--- a/typesafety/test_pointfree/test_modify_env3.yml
+++ b/typesafety/test_pointfree/test_modify_env3.yml
@@ -38,7 +38,7 @@
         ...
 
     x: RequiresContextResult[float, Exception, int]
-    reveal_type(modify_env3(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.float, builtins.Exception, builtins.str]"
+    reveal_type(modify_env3(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[float, Exception, str]"
 
 
 - case: modify_env_and_flow
@@ -55,7 +55,7 @@
         ...
 
     r: RequiresContextResult[int, Exception, int]
-    reveal_type(flow(r, modify_env(modify), bind(test)))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.float, builtins.Exception, builtins.str]"
+    reveal_type(flow(r, modify_env(modify), bind(test)))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[float, Exception, str]"
 
 
 - case: modify_env_requires_context_result
@@ -68,7 +68,7 @@
         ...
 
     x: RequiresContextResult[float, Exception, int]
-    reveal_type(modify_env(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.float, builtins.Exception, builtins.str]"
+    reveal_type(modify_env(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[float, Exception, str]"
 
 
 - case: modify_env_requires_context_ioresult
@@ -81,7 +81,7 @@
         ...
 
     x: RequiresContextIOResult[float, Exception, int]
-    reveal_type(modify_env(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.Exception, builtins.str]"
+    reveal_type(modify_env(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[float, Exception, str]"
 
 
 - case: modify_env_requires_context_future_result
@@ -94,7 +94,7 @@
         ...
 
     x: RequiresContextFutureResult[float, Exception, int]
-    reveal_type(modify_env(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.float, builtins.Exception, builtins.str]"
+    reveal_type(modify_env(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[float, Exception, str]"
 
 
 - case: modify_env_custom_type
@@ -119,4 +119,4 @@
         ...
 
     x: MyClass[int, Exception, int]
-    reveal_type(modify_env(test)(x))  # N: Revealed type is "main.MyClass[builtins.int, builtins.Exception, builtins.str]"
+    reveal_type(modify_env(test)(x))  # N: Revealed type is "main.MyClass[int, Exception, str]"
diff --git a/typesafety/test_pointfree/test_rescue.yml b/typesafety/test_pointfree/test_rescue.yml
index a700a0e01..6f1c9fd66 100644
--- a/typesafety/test_pointfree/test_rescue.yml
+++ b/typesafety/test_pointfree/test_rescue.yml
@@ -34,7 +34,7 @@
         ...
 
     x: Maybe[int]
-    reveal_type(lash(test)(x))  # N: Revealed type is "returns.maybe.Maybe[builtins.int]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "returns.maybe.Maybe[int]"
 
 
 - case: lash_result
@@ -47,7 +47,7 @@
         ...
 
     x: Result[int, float]
-    reveal_type(lash(test)(x))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: lash_ioresult
@@ -60,7 +60,7 @@
         ...
 
     x: IOResult[int, float]
-    reveal_type(lash(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: lash_context_result
@@ -73,7 +73,7 @@
         ...
 
     x: RequiresContextResult[float, float, int]
-    reveal_type(lash(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[builtins.float, builtins.str, builtins.int]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "returns.context.requires_context_result.RequiresContextResult[float, str, int]"
 
 
 - case: lash_context_ioresult
@@ -86,7 +86,7 @@
         ...
 
     x: RequiresContextIOResult[float, float, int]
-    reveal_type(lash(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.str, builtins.int]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[float, str, int]"
 
 
 - case: lash_context_future_result
@@ -99,7 +99,7 @@
         ...
 
     x: RequiresContextFutureResult[float, float, int]
-    reveal_type(lash(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.float, builtins.str, builtins.int]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[float, str, int]"
 
 
 - case: lash_future_result
@@ -112,7 +112,7 @@
         ...
 
     x: FutureResult[int, float]
-    reveal_type(lash(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.int, builtins.str]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "returns.future.FutureResult[int, str]"
 
 
 - case: lash_custom_type
@@ -133,4 +133,4 @@
         ...
 
     x: MyClass[int, str]
-    reveal_type(lash(test)(x))  # N: Revealed type is "main.MyClass[builtins.int, builtins.int]"
+    reveal_type(lash(test)(x))  # N: Revealed type is "main.MyClass[int, int]"
diff --git a/typesafety/test_pointfree/test_unify.yml b/typesafety/test_pointfree/test_unify.yml
index 904069016..4bfcaf556 100644
--- a/typesafety/test_pointfree/test_unify.yml
+++ b/typesafety/test_pointfree/test_unify.yml
@@ -8,7 +8,7 @@
         ...
 
     x: Result[str, AssertionError]
-    reveal_type(unify(test)(x))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.AssertionError | builtins.int]"
+    reveal_type(unify(test)(x))  # N: Revealed type is "returns.result.Result[str, AssertionError | int]"
 
 
 - case: unify_ioresult
@@ -21,7 +21,7 @@
         ...
 
     x: IOResult[float, bool]
-    reveal_type(unify(test)(x))  # N: Revealed type is "returns.io.IOResult[builtins.str, builtins.bool | builtins.bytes]"
+    reveal_type(unify(test)(x))  # N: Revealed type is "returns.io.IOResult[str, bool | bytes]"
 
 
 - case: unify_future_result
@@ -34,7 +34,7 @@
         ...
 
     x: FutureResult[bool, float]
-    reveal_type(unify(test)(x))  # N: Revealed type is "returns.future.FutureResult[builtins.bool, builtins.float | builtins.str]"
+    reveal_type(unify(test)(x))  # N: Revealed type is "returns.future.FutureResult[bool, float | str]"
 
 
 - case: unify_reader_ioresult
@@ -47,7 +47,7 @@
         ...
 
     x: ReaderIOResult[float, Exception, float]
-    reveal_type(unify(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.bool, builtins.Exception | builtins.str, builtins.float]"
+    reveal_type(unify(test)(x))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[bool, Exception | str, float]"
 
 
 - case: unify_reader_future_result1
@@ -60,7 +60,7 @@
         ...
 
     x: ReaderFutureResult[int, str, NoDeps]
-    reveal_type(unify(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str | builtins.bool, builtins.bool]"
+    reveal_type(unify(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str | bool, bool]"
 
 
 - case: unify_reader_future_result2
@@ -73,7 +73,7 @@
         ...
 
     x: ReaderFutureResult[int, str, float]
-    reveal_type(unify(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[builtins.int, builtins.str | builtins.bool, builtins.float]"
+    reveal_type(unify(test)(x))  # N: Revealed type is "returns.context.requires_context_future_result.RequiresContextFutureResult[int, str | bool, float]"
 
 
 - case: unify_custom_type
@@ -98,4 +98,4 @@
         ...
 
     x: MyOwn[str, ValueError]
-    reveal_type(unify(test)(x))  # N: Revealed type is "main.MyOwn[builtins.str, builtins.ValueError | builtins.bool]"
+    reveal_type(unify(test)(x))  # N: Revealed type is "main.MyOwn[str, ValueError | bool]"
diff --git a/typesafety/test_primitives/test_hkt/test_dekind/test_dekind.yml b/typesafety/test_primitives/test_hkt/test_dekind/test_dekind.yml
index 678d3947b..f1ce5e2d2 100644
--- a/typesafety/test_primitives/test_hkt/test_dekind/test_dekind.yml
+++ b/typesafety/test_primitives/test_hkt/test_dekind/test_dekind.yml
@@ -5,7 +5,7 @@
     from returns.primitives.hkt import Kind1, dekind
 
     container: Kind1[IO, int]
-    reveal_type(dekind(container))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(dekind(container))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: dekind_bindable
@@ -23,7 +23,7 @@
         function: Callable[[T], Kind1[Bindable1, N]],
     ) -> Bindable1[N]:
         x = dekind(instance.bind(function))
-        reveal_type(x)  # N: Revealed type is "returns.interfaces.bindable.BindableN[N`-2, Never, Never]"
+        reveal_type(x)  # N: Revealed type is "returns.interfaces.bindable.BindableN[N, Never, Never]"
         return x
 
 
@@ -34,7 +34,7 @@
     from returns.primitives.hkt import Kind2, dekind
 
     container: Kind2[IOResult, int, str]
-    reveal_type(dekind(container))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(dekind(container))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: dekind_correct_typevar
@@ -53,7 +53,7 @@
                 'IO', Callable[[_ValueType], _NewValueType],
             ],
         ):
-            reveal_type(dekind(container))  # N: Revealed type is "main.IO[def (_ValueType`1) -> _NewValueType`-1]"
+            reveal_type(dekind(container))  # N: Revealed type is "main.IO[def (_ValueType) -> _NewValueType]"
 
 
 - case: dekind_wrong_non_instance
diff --git a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded.yml b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded.yml
index 3ea83a3d9..d33077a09 100644
--- a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded.yml
+++ b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded.yml
@@ -32,7 +32,7 @@
         ...
 
     container: IO[str]
-    reveal_type(test(container))  # N: Revealed type is "returns.io.IO[builtins.str]"
+    reveal_type(test(container))  # N: Revealed type is "returns.io.IO[str]"
 
 
 - case: kinded_with_kind2
@@ -51,7 +51,7 @@
         ...
 
     container: IOResult[int, str]
-    reveal_type(test(container))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(test(container))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: kinded_with_kind3
@@ -71,7 +71,7 @@
         ...
 
     container: ReaderIOResult[int, str, bool]
-    reveal_type(test(container))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(test(container))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
 
 
 - case: kinded_regression521
@@ -93,7 +93,7 @@
         ...
 
     container: Iterable[ReaderIOResult[int, str, bool]]
-    reveal_type(test(container))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[typing.Sequence[builtins.int], builtins.str, builtins.bool]"
+    reveal_type(test(container))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[typing.Sequence[int], str, bool]"
 
 
 - case: kinded_with_container1
@@ -113,7 +113,7 @@
         ...
 
     container: IO[int]
-    reveal_type(test(container))  # N: Revealed type is "returns.io.IO[builtins.int]"
+    reveal_type(test(container))  # N: Revealed type is "returns.io.IO[int]"
 
 
 - case: kinded_with_container2
@@ -133,7 +133,7 @@
         ...
 
     container: IOResult[int, str]
-    reveal_type(test(container))  # N: Revealed type is "returns.io.IOResult[builtins.int, builtins.str]"
+    reveal_type(test(container))  # N: Revealed type is "returns.io.IOResult[int, str]"
 
 
 - case: kinded_with_container3
@@ -153,4 +153,4 @@
         ...
 
     container: ReaderIOResult[int, str, bool]
-    reveal_type(test(container))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]"
+    reveal_type(test(container))  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]"
diff --git a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml
index 38c8f08cc..3d78d8ef9 100644
--- a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml
+++ b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_methods.yml
@@ -17,7 +17,7 @@
             ...
 
     x: Mappable[int]
-    reveal_type(x.map(str))  # N: Revealed type is "main.Mappable[builtins.str]"
+    reveal_type(x.map(str))  # N: Revealed type is "main.Mappable[str]"
 
 
 - case: kinded_with_unannotated_self_method
@@ -66,7 +66,7 @@
 
     x: Mappable
     y: My[int]
-    reveal_type(x.map(y, str))  # N: Revealed type is "main.My[builtins.str]"
+    reveal_type(x.map(y, str))  # N: Revealed type is "main.My[str]"
 
 
 - case: kinded_classmethod_with_two_params1
@@ -93,9 +93,9 @@
         ...
 
     y: My[int]
-    reveal_type(Mappable.map(y, str))  # N: Revealed type is "main.My[builtins.str]"
-    reveal_type(My.map(y, str))  # N: Revealed type is "main.My[builtins.str]"
-    reveal_type(y.map(y, str))  # N: Revealed type is "main.My[builtins.str]"
+    reveal_type(Mappable.map(y, str))  # N: Revealed type is "main.My[str]"
+    reveal_type(My.map(y, str))  # N: Revealed type is "main.My[str]"
+    reveal_type(y.map(y, str))  # N: Revealed type is "main.My[str]"
 
 
 - case: kinded_classmethod_with_two_params2
@@ -122,9 +122,9 @@
         ...
 
     y: My[int]
-    reveal_type(Mappable.map(y, str))  # N: Revealed type is "main.My[builtins.str]"
-    reveal_type(My.map(y, str))  # N: Revealed type is "main.My[builtins.str]"
-    reveal_type(y.map(y, str))  # N: Revealed type is "main.My[builtins.str]"
+    reveal_type(Mappable.map(y, str))  # N: Revealed type is "main.My[str]"
+    reveal_type(My.map(y, str))  # N: Revealed type is "main.My[str]"
+    reveal_type(y.map(y, str))  # N: Revealed type is "main.My[str]"
 
 
 - case: kinded_with_wrong_self_type1
diff --git a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_nested.yml b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_nested.yml
index 9ad2c69b3..e59084c4d 100644
--- a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_nested.yml
+++ b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_nested.yml
@@ -13,7 +13,7 @@
         ...
 
     x: ReaderIOResult[int, str, bool]
-    reveal_type(test(x))  # N: Revealed type is "typing.Sequence[returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]]"
+    reveal_type(test(x))  # N: Revealed type is "typing.Sequence[returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]]"
 
 
 - case: kinded_with_nested_kind_instance
@@ -27,7 +27,7 @@
     def test() -> Sequence[KindN[ReaderIOResult, int, str, bool]]:
         ...
 
-    reveal_type(test())  # N: Revealed type is "typing.Sequence[returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]]"
+    reveal_type(test())  # N: Revealed type is "typing.Sequence[returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]]"
 
 
 - case: kinded_with_nested_kind_callable
@@ -46,7 +46,7 @@
     ]:
         ...
 
-    reveal_type(test())  # N: Revealed type is "typing.Sequence[def (returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]) -> returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]]"
+    reveal_type(test())  # N: Revealed type is "typing.Sequence[def (returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]) -> returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]]"
 
 
 - case: kinded_with_nested_kind_tuple
@@ -63,7 +63,7 @@
     ]:
         ...
 
-    reveal_type(test())  # N: Revealed type is "tuple[returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool], returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.bytes, builtins.object]]"
+    reveal_type(test())  # N: Revealed type is "tuple[returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool], returns.context.requires_context_ioresult.RequiresContextIOResult[float, bytes, object]]"
 
 
 - case: kinded_with_nested_kind_union
@@ -80,7 +80,7 @@
     ):
         ...
 
-    reveal_type(test())  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool] | returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.float, builtins.bytes, builtins.object]"
+    reveal_type(test())  # N: Revealed type is "returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool] | returns.context.requires_context_ioresult.RequiresContextIOResult[float, bytes, object]"
 
 
 - case: kinded_with_nested_kind_type
@@ -94,4 +94,4 @@
     def test() -> Type[KindN[ReaderIOResult, int, str, bool]]:
         ...
 
-    reveal_type(test())  # N: Revealed type is "type[returns.context.requires_context_ioresult.RequiresContextIOResult[builtins.int, builtins.str, builtins.bool]]"
+    reveal_type(test())  # N: Revealed type is "type[returns.context.requires_context_ioresult.RequiresContextIOResult[int, str, bool]]"
diff --git a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_overload.yml b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_overload.yml
index 8e5382fcc..927dc15df 100644
--- a/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_overload.yml
+++ b/typesafety/test_primitives/test_hkt/test_kinded/test_kinded_overload.yml
@@ -32,4 +32,4 @@
     test = kinded(_test)
     x: Maybe[int]
     reveal_type(test(x))  # N: Revealed type is "returns.maybe.Maybe[None]"
-    reveal_type(test(x, 'a'))  # N: Revealed type is "returns.maybe.Maybe[builtins.str]"
+    reveal_type(test(x, 'a'))  # N: Revealed type is "returns.maybe.Maybe[str]"
diff --git a/typesafety/test_primitives/test_hkt/test_kindn/test_kindn_getattr.yml b/typesafety/test_primitives/test_hkt/test_kindn/test_kindn_getattr.yml
index bd93be1d1..29e9fd330 100644
--- a/typesafety/test_primitives/test_hkt/test_kindn/test_kindn_getattr.yml
+++ b/typesafety/test_primitives/test_hkt/test_kindn/test_kindn_getattr.yml
@@ -5,7 +5,7 @@
     from typing import List
 
     container: Kind1[List, int]
-    reveal_type(container.pop)  # N: Revealed type is "def (typing.SupportsIndex =) -> builtins.int"
+    reveal_type(container.pop)  # N: Revealed type is "def (typing.SupportsIndex =) -> int"
 
 
 - case: kind_missing_getattr
diff --git a/typesafety/test_primitives/test_hkt/test_supports_kind.yml b/typesafety/test_primitives/test_hkt/test_supports_kind.yml
index 080747cde..0c17c4213 100644
--- a/typesafety/test_primitives/test_hkt/test_supports_kind.yml
+++ b/typesafety/test_primitives/test_hkt/test_supports_kind.yml
@@ -34,6 +34,6 @@
     reveal_type(container.existing)
     reveal_type(container.missing)
   out: |
-    main:10: note: Revealed type is "builtins.int"
+    main:10: note: Revealed type is "int"
     main:11: error: "Custom[int]" has no attribute "missing"  [attr-defined]
     main:11: note: Revealed type is "Any"
diff --git a/typesafety/test_primitives/test_reawaitable/test_reawaitable_decorator.yml b/typesafety/test_primitives/test_reawaitable/test_reawaitable_decorator.yml
index a36fd9ee4..7c64f7654 100644
--- a/typesafety/test_primitives/test_reawaitable/test_reawaitable_decorator.yml
+++ b/typesafety/test_primitives/test_reawaitable/test_reawaitable_decorator.yml
@@ -8,4 +8,4 @@
     async def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         ...
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> typing.Coroutine[Any, Any, builtins.int]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> typing.Coroutine[Any, Any, int]"
diff --git a/typesafety/test_primitives/test_tracing/test_collect_traces.yml b/typesafety/test_primitives/test_tracing/test_collect_traces.yml
index b39fb29aa..5fbaac9c3 100644
--- a/typesafety/test_primitives/test_tracing/test_collect_traces.yml
+++ b/typesafety/test_primitives/test_tracing/test_collect_traces.yml
@@ -4,7 +4,7 @@
   main: |
     from returns.primitives.tracing import collect_traces
 
-    reveal_type(collect_traces)  # N: Revealed type is "Overload(def () -> contextlib.AbstractContextManager[None, builtins.bool | None], def [_FunctionType <: def (*Any, **Any) -> Any] (function: _FunctionType`-1) -> _FunctionType`-1)"
+    reveal_type(collect_traces)  # N: Revealed type is "Overload(def () -> contextlib.AbstractContextManager[None, bool | None], def [_FunctionType <: def (*Any, **Any) -> Any] (function: _FunctionType) -> _FunctionType)"
 
 
 - case: collect_traces_context_manager_return_type_two
@@ -13,7 +13,7 @@
   main: |
     from returns.primitives.tracing import collect_traces
 
-    with reveal_type(collect_traces()):  # N: Revealed type is "contextlib.AbstractContextManager[None, builtins.bool | None]"
+    with reveal_type(collect_traces()):  # N: Revealed type is "contextlib.AbstractContextManager[None, bool | None]"
         pass
 
 
@@ -26,7 +26,7 @@
     def function() -> int:
       return 0
 
-    reveal_type(function)  # N: Revealed type is "def () -> builtins.int"
+    reveal_type(function)  # N: Revealed type is "def () -> int"
 
 
 - case: collect_traces_decorated_function_with_argument_return_type
@@ -38,4 +38,4 @@
     def function(number: int) -> str:
       return str(number)
 
-    reveal_type(function)  # N: Revealed type is "def (number: builtins.int) -> builtins.str"
+    reveal_type(function)  # N: Revealed type is "def (number: int) -> str"
diff --git a/typesafety/test_result/test_attempt.yml b/typesafety/test_result/test_attempt.yml
index 95e24fa5e..ecdb61f53 100644
--- a/typesafety/test_result/test_attempt.yml
+++ b/typesafety/test_result/test_attempt.yml
@@ -19,12 +19,12 @@
     def test(param: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (builtins.str) -> returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(test)  # N: Revealed type is "def (str) -> returns.result.Result[int, str]"
 
     def test2(param: int) -> str:
         return 'str'
 
-    reveal_type(attempt(test2))  # N: Revealed type is "def (builtins.int) -> returns.result.Result[builtins.str, builtins.int]"
+    reveal_type(attempt(test2))  # N: Revealed type is "def (int) -> returns.result.Result[str, int]"
 
 
 - case: attempt_decorator_two_params
diff --git a/typesafety/test_result/test_construct_failure.yml b/typesafety/test_result/test_construct_failure.yml
index f51e3837a..f4156e253 100644
--- a/typesafety/test_result/test_construct_failure.yml
+++ b/typesafety/test_result/test_construct_failure.yml
@@ -7,7 +7,7 @@
         ...
 
     first: Result[str, int] = Failure(1)
-    reveal_type(first.lash(returns_result))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.Exception]"
+    reveal_type(first.lash(returns_result))  # N: Revealed type is "returns.result.Result[str, Exception]"
 
 
 - case: failure_alt
@@ -15,7 +15,7 @@
   main: |
     from returns.result import Failure
 
-    reveal_type(Failure(1).alt(str))  # N: Revealed type is "returns.result.Result[Any, builtins.str]"
+    reveal_type(Failure(1).alt(str))  # N: Revealed type is "returns.result.Result[Any, str]"
 
 
 - case: failure_failure
@@ -23,4 +23,4 @@
   main: |
     from returns.result import Failure
 
-    reveal_type(Failure(1).failure())  # N: Revealed type is "builtins.int"
+    reveal_type(Failure(1).failure())  # N: Revealed type is "int"
diff --git a/typesafety/test_result/test_construct_success.yml b/typesafety/test_result/test_construct_success.yml
index 82c976d09..7d0ed6729 100644
--- a/typesafety/test_result/test_construct_success.yml
+++ b/typesafety/test_result/test_construct_success.yml
@@ -7,7 +7,7 @@
         ...
 
     first: Result[int, Exception] = Success(1)
-    reveal_type(first.bind(returns_result))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.Exception]"
+    reveal_type(first.bind(returns_result))  # N: Revealed type is "returns.result.Result[str, Exception]"
 
 
 - case: success_bind_result
@@ -19,7 +19,7 @@
         ...
 
     first: Result[int, Exception] = Success(1)
-    reveal_type(first.bind_result(returns_result))  # N: Revealed type is "returns.result.Result[builtins.str, builtins.Exception]"
+    reveal_type(first.bind_result(returns_result))  # N: Revealed type is "returns.result.Result[str, Exception]"
 
 
 - case: success_map
@@ -27,7 +27,7 @@
   main: |
     from returns.result import Success, Result
 
-    reveal_type(Success(1).map(str))  # N: Revealed type is "returns.result.Result[builtins.str, Any]"
+    reveal_type(Success(1).map(str))  # N: Revealed type is "returns.result.Result[str, Any]"
 
 
 - case: success_apply1
@@ -35,7 +35,7 @@
   main: |
     from returns.result import Success, Result
 
-    reveal_type(Success(1).apply(Success(str)))  # N: Revealed type is "returns.result.Result[builtins.str, Any]"
+    reveal_type(Success(1).apply(Success(str)))  # N: Revealed type is "returns.result.Result[str, Any]"
 
 
 - case: success_apply2
@@ -48,7 +48,7 @@
     def sum_two(first: int, second: float) -> str:
         ...
 
-    reveal_type(Success(2.0).apply(Success(1).apply(Success(sum_two))))  # N: Revealed type is "returns.result.Result[builtins.str, Any]"
+    reveal_type(Success(2.0).apply(Success(1).apply(Success(sum_two))))  # N: Revealed type is "returns.result.Result[str, Any]"
 
 
 - case: success_value_or
@@ -56,7 +56,7 @@
   main: |
     from returns.result import Success
 
-    reveal_type(Success(1).value_or(None))  # N: Revealed type is "builtins.int | None"
+    reveal_type(Success(1).value_or(None))  # N: Revealed type is "int | None"
 
 
 - case: success_unwrap
@@ -64,4 +64,4 @@
   main: |
     from returns.result import Success
 
-    reveal_type(Success(1).unwrap())  # N: Revealed type is "builtins.int"
+    reveal_type(Success(1).unwrap())  # N: Revealed type is "int"
diff --git a/typesafety/test_result/test_do.yml b/typesafety/test_result/test_do.yml
index f9219ab2b..d420e702d 100644
--- a/typesafety/test_result/test_do.yml
+++ b/typesafety/test_result/test_do.yml
@@ -3,7 +3,7 @@
   main: |
     from returns.result import Result, Failure
 
-    reveal_type(Result.do(  # N: Revealed type is "returns.result.Result[Any, builtins.int | builtins.str]"
+    reveal_type(Result.do(  # N: Revealed type is "returns.result.Result[Any, int | str]"
         first / second
         for first in Failure(1)
         for second in Failure('a')
@@ -15,7 +15,7 @@
   main: |
     from returns.result import Success, Result
 
-    reveal_type(Result.do(  # N: Revealed type is "returns.result.Result[builtins.float, Never]"
+    reveal_type(Result.do(  # N: Revealed type is "returns.result.Result[float, Never]"
         x + y
         for x in Success(1)
         for y in Success(2.5)
@@ -30,7 +30,7 @@
     a: Result[int, str]
     b: Result[float, bytes]
 
-    reveal_type(Result.do(  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str | builtins.bytes]"
+    reveal_type(Result.do(  # N: Revealed type is "returns.result.Result[float, str | bytes]"
         x + y
         for x in a
         for y in b
@@ -45,7 +45,7 @@
 
     Result.do(
         x + y
-        for x in IOSuccess(1)  # E: Invalid type supplied in do-notation: expected "returns.result.Result[Any, Any]", got "returns.io.IOSuccess[builtins.int]"  [misc]
+        for x in IOSuccess(1)  # E: Invalid type supplied in do-notation: expected "returns.result.Result[Any, Any]", got "returns.io.IOSuccess[int]"  [misc]
         for y in Success(2.5)
     )
 
diff --git a/typesafety/test_result/test_result_error.yml b/typesafety/test_result/test_result_error.yml
index 8fb1c0e6a..ce767e137 100644
--- a/typesafety/test_result/test_result_error.yml
+++ b/typesafety/test_result/test_result_error.yml
@@ -8,4 +8,4 @@
             return Success(arg)
         return Failure(ValueError('test'))
 
-    reveal_type(some(1))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(some(1))  # N: Revealed type is "returns.result.Result[int, Exception]"
diff --git a/typesafety/test_result/test_result_type_cast.yml b/typesafety/test_result/test_result_type_cast.yml
index f2fce9df7..93056ebf9 100644
--- a/typesafety/test_result/test_result_type_cast.yml
+++ b/typesafety/test_result/test_result_type_cast.yml
@@ -4,7 +4,7 @@
     from returns.result import Result, Success
 
     first: Result[int, Exception] = Success(1)
-    reveal_type(first)  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.result.Result[int, Exception]"
 
 
 - case: result_success_cast2
@@ -13,7 +13,7 @@
     from returns.result import Result, Success
 
     first: Result[object, Exception] = Success(1)
-    reveal_type(first)  # N: Revealed type is "returns.result.Result[builtins.object, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.result.Result[object, Exception]"
 
 
 - case: result_failure_cast1
@@ -22,7 +22,7 @@
     from returns.result import Result, Failure
 
     first: Result[int, Exception] = Failure(Exception())
-    reveal_type(first)  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.result.Result[int, Exception]"
 
 
 - case: result_failure_cast2
@@ -31,7 +31,7 @@
     from returns.result import Result, Failure
 
     first: Result[int, Exception] = Failure(TypeError())
-    reveal_type(first)  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(first)  # N: Revealed type is "returns.result.Result[int, Exception]"
 
 
 - case: result_swap
@@ -40,7 +40,7 @@
     from returns.result import Result
 
     x: Result[int, str]
-    reveal_type(x.swap())  # N: Revealed type is "returns.result.Result[builtins.str, builtins.int]"
+    reveal_type(x.swap())  # N: Revealed type is "returns.result.Result[str, int]"
 
 
 - case: result_getattr
@@ -57,7 +57,7 @@
   main: |
     from returns.result import Result
 
-    reveal_type(Result.from_value(1))  # N: Revealed type is "returns.result.Result[builtins.int, Any]"
+    reveal_type(Result.from_value(1))  # N: Revealed type is "returns.result.Result[int, Any]"
 
 
 - case: result_from_failure
@@ -65,7 +65,7 @@
   main: |
     from returns.result import Result
 
-    reveal_type(Result.from_failure(1))  # N: Revealed type is "returns.result.Result[Any, builtins.int]"
+    reveal_type(Result.from_failure(1))  # N: Revealed type is "returns.result.Result[Any, int]"
 
 
 - case: result_from_result
@@ -74,7 +74,7 @@
     from returns.result import Result
 
     x: Result[int ,str]
-    reveal_type(Result.from_result(x))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(Result.from_result(x))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: result_covariant_cast
@@ -84,7 +84,7 @@
 
     first: Result[TypeError, ValueError]  # we cast both values
     second: Result[Exception, Exception] = first
-    reveal_type(second)  # N: Revealed type is "returns.result.Result[builtins.Exception, builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.result.Result[Exception, Exception]"
 
 
 - case: result_success_bind_contra1
@@ -96,7 +96,7 @@
       ...
 
     first: Result[int, str] = Success(4)
-    reveal_type(first.bind(test))  # N: Revealed type is "returns.result.Result[builtins.float, builtins.str]"
+    reveal_type(first.bind(test))  # N: Revealed type is "returns.result.Result[float, str]"
 
 
 - case: result_success_bind_contra2
@@ -109,7 +109,7 @@
 
     first: Result[int, Exception]
     second = first.bind(test)
-    reveal_type(second)  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(second)  # N: Revealed type is "returns.result.Result[int, Exception]"
 
 
 - case: result_correct_usage
@@ -122,7 +122,7 @@
             return Success(inner_value + 2)
         return Failure(str(inner_value))
 
-    reveal_type(factory(1))  # N: Revealed type is "returns.result.Result[builtins.int, builtins.str]"
+    reveal_type(factory(1))  # N: Revealed type is "returns.result.Result[int, str]"
 
 
 - case: resulte_typecast1
@@ -136,7 +136,7 @@
         return Failure(ValueError(arg))
 
     result: Result[int, Exception] = function(1)
-    reveal_type(result)  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(result)  # N: Revealed type is "returns.result.Result[int, Exception]"
 
 
 - case: resulte_typecast2
@@ -150,4 +150,4 @@
         return Failure(ValueError(arg))
 
     result: ResultE[int] = function(1)
-    reveal_type(result)  # N: Revealed type is "returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(result)  # N: Revealed type is "returns.result.Result[int, Exception]"
diff --git a/typesafety/test_result/test_safe.yml b/typesafety/test_result/test_safe.yml
index 0d283874e..3daa7b4ab 100644
--- a/typesafety/test_result/test_safe.yml
+++ b/typesafety/test_result/test_safe.yml
@@ -7,7 +7,7 @@
     def test() -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def () -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def () -> returns.result.Result[int, Exception]"
 
 
 - case: safe_decorator_passing_exceptions_no_params
@@ -19,13 +19,13 @@
     def test() -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def () -> returns.result.Result[builtins.int, builtins.ValueError]"
+    reveal_type(test)  # N: Revealed type is "def () -> returns.result.Result[int, ValueError]"
 
     @safe(exceptions=(ValueError,))
     def test2() -> int:
         return 1
 
-    reveal_type(test2)  # N: Revealed type is "def () -> returns.result.Result[builtins.int, builtins.ValueError]"
+    reveal_type(test2)  # N: Revealed type is "def () -> returns.result.Result[int, ValueError]"
 
 
 - case: safe_composition_no_params
@@ -36,7 +36,7 @@
     def test() -> int:
         return 1
 
-    reveal_type(safe(test))  # N: Revealed type is "def () -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(safe(test))  # N: Revealed type is "def () -> returns.result.Result[int, Exception]"
 
 
 - case: safe_composition_passing_exceptions_no_params
@@ -47,7 +47,7 @@
     def test() -> int:
         return 1
 
-    reveal_type(safe((EOFError,))(test))  # N: Revealed type is "def () -> returns.result.Result[builtins.int, builtins.EOFError]"
+    reveal_type(safe((EOFError,))(test))  # N: Revealed type is "def () -> returns.result.Result[int, EOFError]"
 
 
 - case: safe_decorator_with_args
@@ -60,7 +60,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.result.Result[int, Exception]"
 
 
 - case: safe_decorator_passing_exceptions_with_args
@@ -73,7 +73,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.result.Result[int, Exception]"
 
 
 - case: safe_composition_with_args
@@ -85,7 +85,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(safe(test))  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(safe(test))  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.result.Result[int, Exception]"
 
 
 - case: safe_composition_passing_exceptions_with_args
@@ -97,7 +97,7 @@
     def test(first: int, second: Optional[str] = None, *, kw: bool = True) -> int:
         return 1
 
-    reveal_type(safe((ValueError,))(test))  # N: Revealed type is "def (first: builtins.int, second: builtins.str | None =, *, kw: builtins.bool =) -> returns.result.Result[builtins.int, builtins.ValueError]"
+    reveal_type(safe((ValueError,))(test))  # N: Revealed type is "def (first: int, second: str | None =, *, kw: bool =) -> returns.result.Result[int, ValueError]"
 
 
 - case: safe_regression333
@@ -110,7 +110,7 @@
     def send(text: str) -> Any:
         return "test"
 
-    reveal_type(send)  # N: Revealed type is "def (text: builtins.str) -> returns.result.Result[Any, builtins.Exception]"
+    reveal_type(send)  # N: Revealed type is "def (text: str) -> returns.result.Result[Any, Exception]"
 
 
 - case: safe_passing_exceptions_regression333
@@ -123,7 +123,7 @@
     def send(text: str) -> Any:
         return "test"
 
-    reveal_type(send)  # N: Revealed type is "def (text: builtins.str) -> returns.result.Result[Any, builtins.Exception]"
+    reveal_type(send)  # N: Revealed type is "def (text: str) -> returns.result.Result[Any, Exception]"
 
 
 - case: safe_regression641
@@ -136,7 +136,7 @@
         def raise_for_status(self) -> None:
             ...
 
-    reveal_type(safe(tap(Response.raise_for_status)))  # N: Revealed type is "def (main.Response) -> returns.result.Result[main.Response, builtins.Exception]"
+    reveal_type(safe(tap(Response.raise_for_status)))  # N: Revealed type is "def (main.Response) -> returns.result.Result[main.Response, Exception]"
 
 
 - case: safe_passing_exceptions_regression641
@@ -149,7 +149,7 @@
         def raise_for_status(self) -> None:
             ...
 
-    reveal_type(safe((EOFError,))(tap(Response.raise_for_status)))  # N: Revealed type is "def (main.Response) -> returns.result.Result[main.Response, builtins.EOFError]"
+    reveal_type(safe((EOFError,))(tap(Response.raise_for_status)))  # N: Revealed type is "def (main.Response) -> returns.result.Result[main.Response, EOFError]"
 
 
 - case: safe_decorator_with_args_kwargs
@@ -161,7 +161,7 @@
     def test(*args, **kwargs) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.result.Result[int, Exception]"
 
 
 - case: safe_decorator_passing_exceptions_with_args_kwargs
@@ -173,7 +173,7 @@
     def test(*args, **kwargs) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.result.Result[builtins.int, builtins.EOFError]"
+    reveal_type(test)  # N: Revealed type is "def (*args: Any, **kwargs: Any) -> returns.result.Result[int, EOFError]"
 
 
 - case: safe_decorator_with_args_kwargs
@@ -185,7 +185,7 @@
     def test(*args: int, **kwargs: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: builtins.int, **kwargs: builtins.str) -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def (*args: int, **kwargs: str) -> returns.result.Result[int, Exception]"
 
 
 - case: safe_decorator_passing_exceptions_with_args_kwargs
@@ -197,7 +197,7 @@
     def test(*args: int, **kwargs: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: builtins.int, **kwargs: builtins.str) -> returns.result.Result[builtins.int, builtins.Exception]"
+    reveal_type(test)  # N: Revealed type is "def (*args: int, **kwargs: str) -> returns.result.Result[int, Exception]"
 
 
 - case: safe_decorator_composition
@@ -211,7 +211,7 @@
     def test(*args: int, **kwargs: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: builtins.int, **kwargs: builtins.str) -> returns.io.IO[returns.result.Result[builtins.int, builtins.Exception]]"
+    reveal_type(test)  # N: Revealed type is "def (*args: int, **kwargs: str) -> returns.io.IO[returns.result.Result[int, Exception]]"
 
 
 - case: safe_decorator_passing_exceptions_composition
@@ -225,7 +225,7 @@
     def test(*args: int, **kwargs: str) -> int:
         return 1
 
-    reveal_type(test)  # N: Revealed type is "def (*args: builtins.int, **kwargs: builtins.str) -> returns.io.IO[returns.result.Result[builtins.int, builtins.ValueError]]"
+    reveal_type(test)  # N: Revealed type is "def (*args: int, **kwargs: str) -> returns.io.IO[returns.result.Result[int, ValueError]]"
 
 
 - case: safe_decorator_wrong_exceptions_types
diff --git a/typesafety/test_trampolines/test_trampoline.yml b/typesafety/test_trampolines/test_trampoline.yml
index 08e26a9a4..e45c773a6 100644
--- a/typesafety/test_trampolines/test_trampoline.yml
+++ b/typesafety/test_trampolines/test_trampoline.yml
@@ -44,4 +44,4 @@
     ) -> int | Trampoline[int]:
         return Trampoline(_accumulate, [1], 2)
 
-    reveal_type(_accumulate([1, 2]))  # N: Revealed type is "builtins.int"
+    reveal_type(_accumulate([1, 2]))  # N: Revealed type is "int"
diff --git a/typesafety/test_unsafe/test_unsafe.yml b/typesafety/test_unsafe/test_unsafe.yml
index 5d6f6c072..9f5e50e61 100644
--- a/typesafety/test_unsafe/test_unsafe.yml
+++ b/typesafety/test_unsafe/test_unsafe.yml
@@ -4,4 +4,4 @@
     from returns.io import IO
     from returns.unsafe import unsafe_perform_io
 
-    reveal_type(unsafe_perform_io(IO(1)))  # N: Revealed type is "builtins.int"
+    reveal_type(unsafe_perform_io(IO(1)))  # N: Revealed type is "int"

From 5d5e6db1e02ad92fb9d41e78accf76a144dd628b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 14 Apr 2026 06:10:25 +0000
Subject: [PATCH 3/3] Bump mypy minimum to 1.19, regenerate lock file, clean up
 dead version checks

- Bump mypy version constraint from >=1.12,<1.21 to >=1.19,<1.21
- Regenerate poetry.lock to fix CI (lock file was out of sync)
- Remove dead version-check code for mypy < 1.16 in plugin
  (analyze_member_access msg parameter handling no longer needed)
- Remove unused imports (importlib.metadata.version, typing.Any)

Agent-Logs-Url: https://github.com/dry-python/returns/sessions/ec3a5de7-f5a3-49a4-a973-9265d6a4555e

Co-authored-by: sobolevn <4660275+sobolevn@users.noreply.github.com>
---
 poetry.lock                               | 207 +++++++++++++++++-----
 pyproject.toml                            |   2 +-
 returns/contrib/mypy/_features/kind.py    |  10 --
 returns/contrib/mypy/_typeops/analtype.py |  13 +-
 4 files changed, 163 insertions(+), 69 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4bcb5c1ee..231ac5588 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -729,6 +729,107 @@ files = [
 [package.dependencies]
 referencing = ">=0.31.0"
 
+[[package]]
+name = "librt"
+version = "0.9.0"
+description = "Mypyc runtime library"
+optional = false
+python-versions = ">=3.9"
+groups = ["main", "dev"]
+files = [
+    {file = "librt-0.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f8e12706dcb8ff6b3ed57514a19e45c49ad00bcd423e87b2b2e4b5f64578443"},
+    {file = "librt-0.9.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4e3dda8345307fd7306db0ed0cb109a63a2c85ba780eb9dc2d09b2049a931f9c"},
+    {file = "librt-0.9.0-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:de7dac64e3eb832ffc7b840eb8f52f76420cde1b845be51b2a0f6b870890645e"},
+    {file = "librt-0.9.0-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:22a904cbdb678f7cb348c90d543d3c52f581663d687992fee47fd566dcbf5285"},
+    {file = "librt-0.9.0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:224b9727eb8bc188bc3bcf29d969dba0cd61b01d9bac80c41575520cc4baabb2"},
+    {file = "librt-0.9.0-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e94cbc6ad9a6aeea46d775cbb11f361022f778a9cc8cc90af653d3a594b057ce"},
+    {file = "librt-0.9.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:7bc30ad339f4e1a01d4917d645e522a0bc0030644d8973f6346397c93ba1503f"},
+    {file = "librt-0.9.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:56d65b583cf43b8cf4c8fbe1e1da20fa3076cc32a1149a141507af1062718236"},
+    {file = "librt-0.9.0-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:0a1be03168b2691ba61927e299b352a6315189199ca18a57b733f86cb3cc8d38"},
+    {file = "librt-0.9.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:63c12efcd160e1d14da11af0c46c0217473e1e0d2ae1acbccc83f561ea4c2a7b"},
+    {file = "librt-0.9.0-cp310-cp310-win32.whl", hash = "sha256:e9002e98dcb1c0a66723592520decd86238ddcef168b37ff6cfb559200b4b774"},
+    {file = "librt-0.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:9fcb461fbf70654a52a7cc670e606f04449e2374c199b1825f754e16dacfedd8"},
+    {file = "librt-0.9.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:90904fac73c478f4b83f4ed96c99c8208b75e6f9a8a1910548f69a00f1eaa671"},
+    {file = "librt-0.9.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:789fff71757facc0738e8d89e3b84e4f0251c1c975e85e81b152cdaca927cc2d"},
+    {file = "librt-0.9.0-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:1bf465d1e5b0a27713862441f6467b5ab76385f4ecf8f1f3a44f8aa3c695b4b6"},
+    {file = "librt-0.9.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f819e0c6413e259a17a7c0d49f97f405abadd3c2a316a3b46c6440b7dbbedbb1"},
+    {file = "librt-0.9.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e0785c2fb4a81e1aece366aa3e2e039f4a4d7d21aaaded5227d7f3c703427882"},
+    {file = "librt-0.9.0-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:80b25c7b570a86c03b5da69e665809deb39265476e8e21d96a9328f9762f9990"},
+    {file = "librt-0.9.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d4d16b608a1c43d7e33142099a75cd93af482dadce0bf82421e91cad077157f4"},
+    {file = "librt-0.9.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:194fc1a32e1e21fe809d38b5faea66cc65eaa00217c8901fbdb99866938adbdb"},
+    {file = "librt-0.9.0-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:8c6bc1384d9738781cfd41d09ad7f6e8af13cfea2c75ece6bd6d2566cdea2076"},
+    {file = "librt-0.9.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:15cb151e52a044f06e54ac7f7b47adbfc89b5c8e2b63e1175a9d587c43e8942a"},
+    {file = "librt-0.9.0-cp311-cp311-win32.whl", hash = "sha256:f100bfe2acf8a3689af9d0cc660d89f17286c9c795f9f18f7b62dd1a6b247ae6"},
+    {file = "librt-0.9.0-cp311-cp311-win_amd64.whl", hash = "sha256:0b73e4266307e51c95e09c0750b7ec383c561d2e97d58e473f6f6a209952fbb8"},
+    {file = "librt-0.9.0-cp311-cp311-win_arm64.whl", hash = "sha256:bc5518873822d2faa8ebdd2c1a4d7c8ef47b01a058495ab7924cb65bdbf5fc9a"},
+    {file = "librt-0.9.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9b3e3bc363f71bda1639a4ee593cb78f7fbfeacc73411ec0d4c92f00730010a4"},
+    {file = "librt-0.9.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0a09c2f5869649101738653a9b7ab70cf045a1105ac66cbb8f4055e61df78f2d"},
+    {file = "librt-0.9.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5ca8e133d799c948db2ab1afc081c333a825b5540475164726dcbf73537e5c2f"},
+    {file = "librt-0.9.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:603138ee838ee1583f1b960b62d5d0007845c5c423feb68e44648b1359014e27"},
+    {file = "librt-0.9.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f4003f70c56a5addd6aa0897f200dd59afd3bf7bcd5b3cce46dd21f925743bc2"},
+    {file = "librt-0.9.0-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:78042f6facfd98ecb25e9829c7e37cce23363d9d7c83bc5f72702c5059eb082b"},
+    {file = "librt-0.9.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a361c9434a64d70a7dbb771d1de302c0cc9f13c0bffe1cf7e642152814b35265"},
+    {file = "librt-0.9.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:dd2c7e082b0b92e1baa4da28163a808672485617bc855cc22a2fd06978fa9084"},
+    {file = "librt-0.9.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:7e6274fd33fc5b2a14d41c9119629d3ff395849d8bcbc80cf637d9e8d2034da8"},
+    {file = "librt-0.9.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5093043afb226ecfa1400120d1ebd4442b4f99977783e4f4f7248879009b227f"},
+    {file = "librt-0.9.0-cp312-cp312-win32.whl", hash = "sha256:9edcc35d1cae9fd5320171b1a838c7da8a5c968af31e82ecc3dff30b4be0957f"},
+    {file = "librt-0.9.0-cp312-cp312-win_amd64.whl", hash = "sha256:3cc2917258e131ae5f958a4d872e07555b51cb7466a43433218061c74ef33745"},
+    {file = "librt-0.9.0-cp312-cp312-win_arm64.whl", hash = "sha256:90e6d5420fc8a300518d4d2288154ff45005e920425c22cbbfe8330f3f754bd9"},
+    {file = "librt-0.9.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f29b68cd9714531672db62cc54f6e8ff981900f824d13fa0e00749189e13778e"},
+    {file = "librt-0.9.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:7d5c8a5929ac325729f6119802070b561f4db793dffc45e9ac750992a4ed4d22"},
+    {file = "librt-0.9.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:756775d25ec8345b837ab52effee3ad2f3b2dfd6bbee3e3f029c517bd5d8f05a"},
+    {file = "librt-0.9.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2b8f5d00b49818f4e2b1667db994488b045835e0ac16fe2f924f3871bd2b8ac5"},
+    {file = "librt-0.9.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c81aef782380f0f13ead670aae01825eb653b44b046aa0e5ebbb79f76ed4aa11"},
+    {file = "librt-0.9.0-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:66b58fed90a545328e80d575467244de3741e088c1af928f0b489ebec3ef3858"},
+    {file = "librt-0.9.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e78fb7419e07d98c2af4b8567b72b3eaf8cb05caad642e9963465569c8b2d87e"},
+    {file = "librt-0.9.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:2c3786f0f4490a5cd87f1ed6cefae833ad6b1060d52044ce0434a2e85893afd0"},
+    {file = "librt-0.9.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:8494cfc61e03542f2d381e71804990b3931175a29b9278fdb4a5459948778dc2"},
+    {file = "librt-0.9.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:07cf11f769831186eeac424376e6189f20ace4f7263e2134bdb9757340d84d4d"},
+    {file = "librt-0.9.0-cp313-cp313-win32.whl", hash = "sha256:850d6d03177e52700af605fd60db7f37dcb89782049a149674d1a9649c2138fd"},
+    {file = "librt-0.9.0-cp313-cp313-win_amd64.whl", hash = "sha256:a5af136bfba820d592f86c67affcef9b3ff4d4360ac3255e341e964489b48519"},
+    {file = "librt-0.9.0-cp313-cp313-win_arm64.whl", hash = "sha256:4c4d0440a3a8e31d962340c3e1cc3fc9ee7febd34c8d8f770d06adb947779ea5"},
+    {file = "librt-0.9.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:3f05d145df35dca5056a8bc3838e940efebd893a54b3e19b2dda39ceaa299bcb"},
+    {file = "librt-0.9.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1c587494461ebd42229d0f1739f3aa34237dd9980623ecf1be8d3bcba79f4499"},
+    {file = "librt-0.9.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:b0a2040f801406b93657a70b72fa12311063a319fee72ce98e1524da7200171f"},
+    {file = "librt-0.9.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f38bc489037eca88d6ebefc9c4d41a4e07c8e8b4de5188a9e6d290273ad7ebb1"},
+    {file = "librt-0.9.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f3fd278f5e6bf7c75ccd6d12344eb686cc020712683363b66f46ac79d37c799f"},
+    {file = "librt-0.9.0-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fcbdf2a9ca24e87bbebb47f1fe34e531ef06f104f98c9ccfc953a3f3344c567a"},
+    {file = "librt-0.9.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e306d956cfa027fe041585f02a1602c32bfa6bb8ebea4899d373383295a6c62f"},
+    {file = "librt-0.9.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:465814ab157986acb9dfa5ccd7df944be5eefc0d08d31ec6e8d88bc71251d845"},
+    {file = "librt-0.9.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:703f4ae36d6240bfe24f542bac784c7e4194ec49c3ba5a994d02891649e2d85b"},
+    {file = "librt-0.9.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:3be322a15ee5e70b93b7a59cfd074614f22cc8c9ff18bd27f474e79137ea8d3b"},
+    {file = "librt-0.9.0-cp314-cp314-win32.whl", hash = "sha256:b8da9f8035bb417770b1e1610526d87ad4fc58a2804dc4d79c53f6d2cf5a6eb9"},
+    {file = "librt-0.9.0-cp314-cp314-win_amd64.whl", hash = "sha256:b8bd70d5d816566a580d193326912f4a76ec2d28a97dc4cd4cc831c0af8e330e"},
+    {file = "librt-0.9.0-cp314-cp314-win_arm64.whl", hash = "sha256:fc5758e2b7a56532dc33e3c544d78cbaa9ecf0a0f2a2da2df882c1d6b99a317f"},
+    {file = "librt-0.9.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:f24b90b0e0c8cc9491fb1693ae91fe17cb7963153a1946395acdbdd5818429a4"},
+    {file = "librt-0.9.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3fe56e80badb66fdcde06bef81bbaa5bfcf6fbd7aefb86222d9e369c38c6b228"},
+    {file = "librt-0.9.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:527b5b820b47a09e09829051452bb0d1dd2122261254e2a6f674d12f1d793d54"},
+    {file = "librt-0.9.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7d429bdd4ac0ab17c8e4a8af0ed2a7440b16eba474909ab357131018fe8c7e71"},
+    {file = "librt-0.9.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7202bdcac47d3a708271c4304a474a8605a4a9a4a709e954bf2d3241140aa938"},
+    {file = "librt-0.9.0-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c0d620e74897f8c2613b3c4e2e9c1e422eb46d2ddd07df540784d44117836af3"},
+    {file = "librt-0.9.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:d69fc39e627908f4c03297d5a88d9284b73f4d90b424461e32e8c2485e21c283"},
+    {file = "librt-0.9.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:c2640e23d2b7c98796f123ffd95cf2022c7777aa8a4a3b98b36c570d37e85eee"},
+    {file = "librt-0.9.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:451daa98463b7695b0a30aa56bf637831ea559e7b8101ac2ef6382e8eb15e29c"},
+    {file = "librt-0.9.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:928bd06eca2c2bbf4349e5b817f837509b0604342e65a502de1d50a7570afd15"},
+    {file = "librt-0.9.0-cp314-cp314t-win32.whl", hash = "sha256:a9c63e04d003bc0fb6a03b348018b9a3002f98268200e22cc80f146beac5dc40"},
+    {file = "librt-0.9.0-cp314-cp314t-win_amd64.whl", hash = "sha256:f162af66a2ed3f7d1d161a82ca584efd15acd9c1cff190a373458c32f7d42118"},
+    {file = "librt-0.9.0-cp314-cp314t-win_arm64.whl", hash = "sha256:a4b25c6c25cac5d0d9d6d6da855195b254e0021e513e0249f0e3b444dc6e0e61"},
+    {file = "librt-0.9.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5112c2fb7c2eefefaeaf5c97fec81343ef44ee86a30dcfaa8223822fba6467b4"},
+    {file = "librt-0.9.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a81eea9b999b985e4bacc650c4312805ea7008fd5e45e1bf221310176a7bcb3a"},
+    {file = "librt-0.9.0-cp39-cp39-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:eea1b54943475f51698f85fa230c65ccac769f1e603b981be060ac5763d90927"},
+    {file = "librt-0.9.0-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:81107843ed1836874b46b310f9b1816abcb89912af627868522461c3b7333c0f"},
+    {file = "librt-0.9.0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:aa95738a68cedd3a6f5492feddc513e2e166b50602958139e47bbdd82da0f5a7"},
+    {file = "librt-0.9.0-cp39-cp39-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6788207daa0c19955d2b668f3294a368d19f67d9b5f274553fd073c1260cbb9f"},
+    {file = "librt-0.9.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:f48c963a76d71b9d7927eb817b543d0dccd52ab6648b99d37bd54f4cd475d856"},
+    {file = "librt-0.9.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:42ff8a962554c350d4a83cf47d9b7b78b0e6ff7943e87df7cdfc97c07f3c016f"},
+    {file = "librt-0.9.0-cp39-cp39-musllinux_1_2_riscv64.whl", hash = "sha256:657f8ba7b9eaaa82759a104137aed2a3ef7bc46ccfd43e0d89b04005b3e0a4cc"},
+    {file = "librt-0.9.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:2d03fa4fd277a7974c1978c92c374c57f44edeee163d147b477b143446ad1bf6"},
+    {file = "librt-0.9.0-cp39-cp39-win32.whl", hash = "sha256:d9da80e5b04acce03ced8ba6479a71c2a2edf535c2acc0d09c80d2f80f3bad15"},
+    {file = "librt-0.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:54d412e47c21b85865676ed0724e37a89e9593c2eee1e7367adf85bfad56ffb1"},
+    {file = "librt-0.9.0.tar.gz", hash = "sha256:a0951822531e7aee6e0dfb556b30d5ee36bbe234faf60c20a16c01be3530869d"},
+]
+markers = {main = "extra == \"compatible-mypy\" and platform_python_implementation != \"PyPy\"", dev = "platform_python_implementation != \"PyPy\""}
+
 [[package]]
 name = "markdown-it-py"
 version = "3.0.0"
@@ -871,56 +972,63 @@ files = [
 
 [[package]]
 name = "mypy"
-version = "1.17.1"
+version = "1.20.1"
 description = "Optional static typing for Python"
 optional = false
-python-versions = ">=3.9"
+python-versions = ">=3.10"
 groups = ["main", "dev"]
 files = [
-    {file = "mypy-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3fbe6d5555bf608c47203baa3e72dbc6ec9965b3d7c318aa9a4ca76f465bd972"},
-    {file = "mypy-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:80ef5c058b7bce08c83cac668158cb7edea692e458d21098c7d3bce35a5d43e7"},
-    {file = "mypy-1.17.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c4a580f8a70c69e4a75587bd925d298434057fe2a428faaf927ffe6e4b9a98df"},
-    {file = "mypy-1.17.1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dd86bb649299f09d987a2eebb4d52d10603224500792e1bee18303bbcc1ce390"},
-    {file = "mypy-1.17.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:a76906f26bd8d51ea9504966a9c25419f2e668f012e0bdf3da4ea1526c534d94"},
-    {file = "mypy-1.17.1-cp310-cp310-win_amd64.whl", hash = "sha256:e79311f2d904ccb59787477b7bd5d26f3347789c06fcd7656fa500875290264b"},
-    {file = "mypy-1.17.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ad37544be07c5d7fba814eb370e006df58fed8ad1ef33ed1649cb1889ba6ff58"},
-    {file = "mypy-1.17.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:064e2ff508e5464b4bd807a7c1625bc5047c5022b85c70f030680e18f37273a5"},
-    {file = "mypy-1.17.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:70401bbabd2fa1aa7c43bb358f54037baf0586f41e83b0ae67dd0534fc64edfd"},
-    {file = "mypy-1.17.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e92bdc656b7757c438660f775f872a669b8ff374edc4d18277d86b63edba6b8b"},
-    {file = "mypy-1.17.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c1fdf4abb29ed1cb091cf432979e162c208a5ac676ce35010373ff29247bcad5"},
-    {file = "mypy-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:ff2933428516ab63f961644bc49bc4cbe42bbffb2cd3b71cc7277c07d16b1a8b"},
-    {file = "mypy-1.17.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:69e83ea6553a3ba79c08c6e15dbd9bfa912ec1e493bf75489ef93beb65209aeb"},
-    {file = "mypy-1.17.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1b16708a66d38abb1e6b5702f5c2c87e133289da36f6a1d15f6a5221085c6403"},
-    {file = "mypy-1.17.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:89e972c0035e9e05823907ad5398c5a73b9f47a002b22359b177d40bdaee7056"},
-    {file = "mypy-1.17.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:03b6d0ed2b188e35ee6d5c36b5580cffd6da23319991c49ab5556c023ccf1341"},
-    {file = "mypy-1.17.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c837b896b37cd103570d776bda106eabb8737aa6dd4f248451aecf53030cdbeb"},
-    {file = "mypy-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:665afab0963a4b39dff7c1fa563cc8b11ecff7910206db4b2e64dd1ba25aed19"},
-    {file = "mypy-1.17.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:93378d3203a5c0800c6b6d850ad2f19f7a3cdf1a3701d3416dbf128805c6a6a7"},
-    {file = "mypy-1.17.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:15d54056f7fe7a826d897789f53dd6377ec2ea8ba6f776dc83c2902b899fee81"},
-    {file = "mypy-1.17.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:209a58fed9987eccc20f2ca94afe7257a8f46eb5df1fb69958650973230f91e6"},
-    {file = "mypy-1.17.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:099b9a5da47de9e2cb5165e581f158e854d9e19d2e96b6698c0d64de911dd849"},
-    {file = "mypy-1.17.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fa6ffadfbe6994d724c5a1bb6123a7d27dd68fc9c059561cd33b664a79578e14"},
-    {file = "mypy-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:9a2b7d9180aed171f033c9f2fc6c204c1245cf60b0cb61cf2e7acc24eea78e0a"},
-    {file = "mypy-1.17.1-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:15a83369400454c41ed3a118e0cc58bd8123921a602f385cb6d6ea5df050c733"},
-    {file = "mypy-1.17.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:55b918670f692fc9fba55c3298d8a3beae295c5cded0a55dccdc5bbead814acd"},
-    {file = "mypy-1.17.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:62761474061feef6f720149d7ba876122007ddc64adff5ba6f374fda35a018a0"},
-    {file = "mypy-1.17.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c49562d3d908fd49ed0938e5423daed8d407774a479b595b143a3d7f87cdae6a"},
-    {file = "mypy-1.17.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:397fba5d7616a5bc60b45c7ed204717eaddc38f826e3645402c426057ead9a91"},
-    {file = "mypy-1.17.1-cp314-cp314-win_amd64.whl", hash = "sha256:9d6b20b97d373f41617bd0708fd46aa656059af57f2ef72aa8c7d6a2b73b74ed"},
-    {file = "mypy-1.17.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5d1092694f166a7e56c805caaf794e0585cabdbf1df36911c414e4e9abb62ae9"},
-    {file = "mypy-1.17.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:79d44f9bfb004941ebb0abe8eff6504223a9c1ac51ef967d1263c6572bbebc99"},
-    {file = "mypy-1.17.1-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b01586eed696ec905e61bd2568f48740f7ac4a45b3a468e6423a03d3788a51a8"},
-    {file = "mypy-1.17.1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:43808d9476c36b927fbcd0b0255ce75efe1b68a080154a38ae68a7e62de8f0f8"},
-    {file = "mypy-1.17.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:feb8cc32d319edd5859da2cc084493b3e2ce5e49a946377663cc90f6c15fb259"},
-    {file = "mypy-1.17.1-cp39-cp39-win_amd64.whl", hash = "sha256:d7598cf74c3e16539d4e2f0b8d8c318e00041553d83d4861f87c7a72e95ac24d"},
-    {file = "mypy-1.17.1-py3-none-any.whl", hash = "sha256:a9f52c0351c21fe24c21d8c0eb1f62967b262d6729393397b6f443c3b773c3b9"},
-    {file = "mypy-1.17.1.tar.gz", hash = "sha256:25e01ec741ab5bb3eec8ba9cdb0f769230368a22c959c4937360efb89b7e9f01"},
+    {file = "mypy-1.20.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3ba5d1e712ada9c3b6223dcbc5a31dac334ed62991e5caa17bcf5a4ddc349af0"},
+    {file = "mypy-1.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2e731284c117b0987fb1e6c5013a56f33e7faa1fce594066ab83876183ce1c66"},
+    {file = "mypy-1.20.1-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f8e945b872a05f4fbefabe2249c0b07b6b194e5e11a86ebee9edf855de09806c"},
+    {file = "mypy-1.20.1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fc88acef0dc9b15246502b418980478c1bfc9702057a0e1e7598d01a7af8937"},
+    {file = "mypy-1.20.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:14911a115c73608f155f648b978c5055d16ff974e6b1b5512d7fedf4fa8b15c6"},
+    {file = "mypy-1.20.1-cp310-cp310-win_amd64.whl", hash = "sha256:76d9b4c992cca3331d9793ef197ae360ea44953cf35beb2526e95b9e074f2866"},
+    {file = "mypy-1.20.1-cp310-cp310-win_arm64.whl", hash = "sha256:b408722f80be44845da555671a5ef3a0c63f51ca5752b0c20e992dc9c0fbd3cd"},
+    {file = "mypy-1.20.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c01eb9bac2c6a962d00f9d23421cd2913840e65bba365167d057bd0b4171a92e"},
+    {file = "mypy-1.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:55d12ddbd8a9cac5b276878bd534fa39fff5bf543dc6ae18f25d30c8d7d27fca"},
+    {file = "mypy-1.20.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c0aa322c1468b6cdfc927a44ce130f79bb44bcd34eb4a009eb9f96571fd80955"},
+    {file = "mypy-1.20.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3f8bc95899cf676b6e2285779a08a998cc3a7b26f1026752df9d2741df3c79e8"},
+    {file = "mypy-1.20.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:47c2b90191a870a04041e910277494b0d92f0711be9e524d45c074fe60c00b65"},
+    {file = "mypy-1.20.1-cp311-cp311-win_amd64.whl", hash = "sha256:9857dc8d2ec1a392ffbda518075beb00ac58859979c79f9e6bdcb7277082c2f2"},
+    {file = "mypy-1.20.1-cp311-cp311-win_arm64.whl", hash = "sha256:09d8df92bb25b6065ab91b178da843dda67b33eb819321679a6e98a907ce0e10"},
+    {file = "mypy-1.20.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:36ee2b9c6599c230fea89bbd79f401f9f9f8e9fcf0c777827789b19b7da90f51"},
+    {file = "mypy-1.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fba3fb0968a7b48806b0c90f38d39296f10766885a94c83bd21399de1e14eb28"},
+    {file = "mypy-1.20.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef1415a637cd3627d6304dfbeddbadd21079dafc2a8a753c477ce4fc0c2af54f"},
+    {file = "mypy-1.20.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ef3461b1ad5cd446e540016e90b5984657edda39f982f4cc45ca317b628f5a37"},
+    {file = "mypy-1.20.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:542dd63c9e1339b6092eb25bd515f3a32a1453aee8c9521d2ddb17dacd840237"},
+    {file = "mypy-1.20.1-cp312-cp312-win_amd64.whl", hash = "sha256:1d55c7cd8ca22e31f93af2a01160a9e95465b5878de23dba7e48116052f20a8d"},
+    {file = "mypy-1.20.1-cp312-cp312-win_arm64.whl", hash = "sha256:f5b84a79070586e0d353ee07b719d9d0a4aa7c8ee90c0ea97747e98cbe193019"},
+    {file = "mypy-1.20.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8f3886c03e40afefd327bd70b3f634b39ea82e87f314edaa4d0cce4b927ddcc1"},
+    {file = "mypy-1.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e860eb3904f9764e83bafd70c8250bdffdc7dde6b82f486e8156348bf7ceb184"},
+    {file = "mypy-1.20.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a4b5aac6e785719da51a84f5d09e9e843d473170a9045b1ea7ea1af86225df4b"},
+    {file = "mypy-1.20.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f37b6cd0fe2ad3a20f05ace48ca3523fc52ff86940e34937b439613b6854472e"},
+    {file = "mypy-1.20.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e4bbb0f6b54ce7cc350ef4a770650d15fa70edd99ad5267e227133eda9c94218"},
+    {file = "mypy-1.20.1-cp313-cp313-win_amd64.whl", hash = "sha256:c3dc20f8ec76eecd77148cdd2f1542ed496e51e185713bf488a414f862deb8f2"},
+    {file = "mypy-1.20.1-cp313-cp313-win_arm64.whl", hash = "sha256:a9d62bbac5d6d46718e2b0330b25e6264463ed832722b8f7d4440ff1be3ca895"},
+    {file = "mypy-1.20.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:12927b9c0ed794daedcf1dab055b6c613d9d5659ac511e8d936d96f19c087d12"},
+    {file = "mypy-1.20.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:752507dd481e958b2c08fc966d3806c962af5a9433b5bf8f3bdd7175c20e34fe"},
+    {file = "mypy-1.20.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c614655b5a065e56274c6cbbe405f7cf7e96c0654db7ba39bc680238837f7b08"},
+    {file = "mypy-1.20.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2c3f6221a76f34d5100c6d35b3ef6b947054123c3f8d6938a4ba00b1308aa572"},
+    {file = "mypy-1.20.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:4bdfc06303ac06500af71ea0cdbe995c502b3c9ba32f3f8313523c137a25d1b6"},
+    {file = "mypy-1.20.1-cp314-cp314-win_amd64.whl", hash = "sha256:0131edd7eba289973d1ba1003d1a37c426b85cdef76650cd02da6420898a5eb3"},
+    {file = "mypy-1.20.1-cp314-cp314-win_arm64.whl", hash = "sha256:33f02904feb2c07e1fdf7909026206396c9deeb9e6f34d466b4cfedb0aadbbe4"},
+    {file = "mypy-1.20.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:168472149dd8cc505c98cefd21ad77e4257ed6022cd5ed2fe2999bed56977a5a"},
+    {file = "mypy-1.20.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:eb674600309a8f22790cca883a97c90299f948183ebb210fbef6bcee07cb1986"},
+    {file = "mypy-1.20.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef2b2e4cc464ba9795459f2586923abd58a0055487cbe558cb538ea6e6bc142a"},
+    {file = "mypy-1.20.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dee461d396dd46b3f0ed5a098dbc9b8860c81c46ad44fa071afcfbc149f167c9"},
+    {file = "mypy-1.20.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e364926308b3e66f1361f81a566fc1b2f8cd47fc8525e8136d4058a65a4b4f02"},
+    {file = "mypy-1.20.1-cp314-cp314t-win_amd64.whl", hash = "sha256:a0c17fbd746d38c70cbc42647cfd884f845a9708a4b160a8b4f7e70d41f4d7fa"},
+    {file = "mypy-1.20.1-cp314-cp314t-win_arm64.whl", hash = "sha256:db2cb89654626a912efda69c0d5c1d22d948265e2069010d3dde3abf751c7d08"},
+    {file = "mypy-1.20.1-py3-none-any.whl", hash = "sha256:1aae28507f253fe82d883790d1c0a0d35798a810117c88184097fe8881052f06"},
+    {file = "mypy-1.20.1.tar.gz", hash = "sha256:6fc3f4ecd52de81648fed1945498bf42fa2993ddfad67c9056df36ae5757f804"},
 ]
 markers = {main = "extra == \"compatible-mypy\""}
 
 [package.dependencies]
+librt = {version = ">=0.8.0", markers = "platform_python_implementation != \"PyPy\""}
 mypy_extensions = ">=1.0.0"
-pathspec = ">=0.9.0"
+pathspec = ">=1.0.0"
 tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
 typing_extensions = ">=4.6.0"
 
@@ -929,6 +1037,7 @@ dmypy = ["psutil (>=4.0)"]
 faster-cache = ["orjson"]
 install-types = ["pip"]
 mypyc = ["setuptools (>=50)"]
+native-parser = ["ast-serialize (>=0.1.1,<1.0.0)"]
 reports = ["lxml"]
 
 [[package]]
@@ -1001,17 +1110,23 @@ markers = {main = "extra == \"check-laws\""}
 
 [[package]]
 name = "pathspec"
-version = "0.12.1"
+version = "1.0.4"
 description = "Utility library for gitignore style pattern matching of file paths."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 groups = ["main", "dev"]
 files = [
-    {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"},
-    {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"},
+    {file = "pathspec-1.0.4-py3-none-any.whl", hash = "sha256:fb6ae2fd4e7c921a165808a552060e722767cfa526f99ca5156ed2ce45a5c723"},
+    {file = "pathspec-1.0.4.tar.gz", hash = "sha256:0210e2ae8a21a9137c0d470578cb0e595af87edaa6ebf12ff176f14a02e0e645"},
 ]
 markers = {main = "extra == \"compatible-mypy\""}
 
+[package.extras]
+hyperscan = ["hyperscan (>=0.7)"]
+optional = ["typing-extensions (>=4)"]
+re2 = ["google-re2 (>=1.1)"]
+tests = ["pytest (>=9)", "typing-extensions (>=4.15)"]
+
 [[package]]
 name = "pluggy"
 version = "1.6.0"
@@ -1989,4 +2104,4 @@ compatible-mypy = ["mypy"]
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.10"
-content-hash = "d59e9bbc8635745ad2a9e27df13c5a4df12c1b46031d1fdff0402a4fe41f4625"
+content-hash = "ca9cac453ef71c03aea6582f704beef804bf08c24301f3b719c2dde430a50fdf"
diff --git a/pyproject.toml b/pyproject.toml
index 679919e23..83ff73103 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,7 +35,7 @@ dependencies.python = "^3.10"
 dependencies.typing-extensions = ">=4.0,<5.0"
 dependencies.pytest = { version = ">=8,<10", optional = true }
 dependencies.hypothesis = { version = "^6.151", optional = true }
-dependencies.mypy = { version = ">=1.12,<1.21", optional = true }
+dependencies.mypy = { version = ">=1.19,<1.21", optional = true }
 extras.compatible-mypy = [ "mypy" ]
 extras.check-laws = [ "pytest", "hypothesis" ]
 group.dev.dependencies.anyio = "^4.3"
diff --git a/returns/contrib/mypy/_features/kind.py b/returns/contrib/mypy/_features/kind.py
index 7aa60da24..110577652 100644
--- a/returns/contrib/mypy/_features/kind.py
+++ b/returns/contrib/mypy/_features/kind.py
@@ -1,7 +1,5 @@
 from collections.abc import Sequence
 from enum import Enum, unique
-from importlib.metadata import version
-from typing import Any
 
 from mypy.checkmember import analyze_member_access
 from mypy.plugin import (
@@ -63,13 +61,6 @@ def attribute_access(ctx: AttributeContext) -> MypyType:
     else:
         return ctx.default_attr_type
 
-    mypy_version_tuple = tuple(
-        map(int, version('mypy').partition('+')[0].split('.'))
-    )
-
-    extra_kwargs: dict[str, Any] = {}
-    if mypy_version_tuple < (1, 16):
-        extra_kwargs['msg'] = ctx.api.msg
     return analyze_member_access(
         ctx.context.name,  # type: ignore
         accessed,
@@ -80,7 +71,6 @@ def attribute_access(ctx: AttributeContext) -> MypyType:
         original_type=instance,
         chk=ctx.api,  # type: ignore
         in_literal_context=ctx.api.expr_checker.is_literal_context(),  # type: ignore
-        **extra_kwargs,
     )
 
 
diff --git a/returns/contrib/mypy/_typeops/analtype.py b/returns/contrib/mypy/_typeops/analtype.py
index b4ce7f760..e95a999c7 100644
--- a/returns/contrib/mypy/_typeops/analtype.py
+++ b/returns/contrib/mypy/_typeops/analtype.py
@@ -1,7 +1,6 @@
 from collections.abc import Sequence
-from importlib.metadata import version
 from types import MappingProxyType
-from typing import Any, Final, Literal, overload
+from typing import Final, Literal, overload
 
 from mypy.checkmember import analyze_member_access
 from mypy.nodes import ARG_NAMED, ARG_OPT
@@ -119,15 +118,6 @@ def translate_to_function(
     """
     checker = ctx.api.expr_checker  # type: ignore
 
-    mypy_version = version('mypy')
-    mypy_version_tuple = tuple(
-        map(int, mypy_version.partition('+')[0].split('.'))
-    )
-
-    extra_kwargs: dict[str, Any] = {}
-    if mypy_version_tuple < (1, 16):
-        extra_kwargs['msg'] = checker.msg
-
     return get_proper_type(
         analyze_member_access(
             '__call__',
@@ -138,6 +128,5 @@ def translate_to_function(
             is_operator=True,
             original_type=function_def,
             chk=checker.chk,
-            **extra_kwargs,
         )
     )