fix: type hints related fixes and refactoring #2111

All 498 tests pass, 3 skipped in 4m 59s

4 files ±0 4 suites ±0 4m 59s ⏱️ -4s
501 tests ±0 498 ✅ ±0 3 💤 ±0 0 ❌ ±0
2 004 runs ±0 1 920 ✅ ±0 84 💤 ±0 0 ❌ ±0

Results for commit 73222fb. ± Comparison against earlier commit 15c04b5.