Avoid unnecessary uses of map()

[akx]

There were some rather legacy or "tricksy" uses of map(), which are probably better written out in other ways.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.68%. Comparing base (5f117b2) to head (adfaf3c).
Report is 3 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #1180   +/-   ##
=======================================
  Coverage   91.68%   91.68%           
=======================================
  Files          27       27           
  Lines        4689     4691    +2     
=======================================
+ Hits         4299     4301    +2     
  Misses        390      390           

Flag	Coverage Δ
macos-14-3.10	90.72% <100.00%> (+<0.01%)	⬆️
macos-14-3.11	90.66% <100.00%> (+<0.01%)	⬆️
macos-14-3.12	90.87% <100.00%> (+<0.01%)	⬆️
macos-14-3.13	90.87% <100.00%> (+<0.01%)	⬆️
macos-14-3.8	90.59% <100.00%> (+<0.01%)	⬆️
macos-14-3.9	90.65% <100.00%> (+<0.01%)	⬆️
macos-14-pypy3.10	90.72% <100.00%> (+<0.01%)	⬆️
ubuntu-24.04-3.10	90.74% <100.00%> (+<0.01%)	⬆️
ubuntu-24.04-3.11	90.68% <100.00%> (+<0.01%)	⬆️
ubuntu-24.04-3.12	90.89% <100.00%> (+<0.01%)	⬆️
ubuntu-24.04-3.13	90.89% <100.00%> (+<0.01%)	⬆️
ubuntu-24.04-3.8	90.61% <100.00%> (+<0.01%)	⬆️
ubuntu-24.04-3.9	90.67% <100.00%> (+<0.01%)	⬆️
ubuntu-24.04-pypy3.10	90.74% <100.00%> (+<0.01%)	⬆️
windows-2022-3.10	90.73% <100.00%> (+<0.01%)	⬆️
windows-2022-3.11	90.67% <100.00%> (+<0.01%)	⬆️
windows-2022-3.12	90.88% <100.00%> (+<0.01%)	⬆️
windows-2022-3.13	90.88% <100.00%> (+<0.01%)	⬆️
windows-2022-3.8	90.71% <100.00%> (+<0.01%)	⬆️
windows-2022-3.9	90.66% <100.00%> (+<0.01%)	⬆️
windows-2022-pypy3.10	90.73% <100.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.