chore: review #6825

[nflaig]

• narrow down some type casts
• remove unrelated formatting changes
• fix a few wrong types

[codecov[bot]]

Codecov Report

Attention: Patch coverage is 82.35294% with 3 lines in your changes missing coverage. Please review.

Project coverage is 62.65%. Comparing base (f33b835) to head (d7a210d).

Additional details and impacted files

```diff @@ Coverage Diff @@ ## nh/types-refactor #6887 +/- ## ================================================== Coverage 62.65% 62.65% ================================================== Files 575 575 Lines 61203 61201 -2 Branches 2117 2119 +2 ================================================== - Hits 38348 38347 -1 + Misses 22816 22815 -1 Partials 39 39 ```