Change more broadcasts over broadcast args to maps

[jishnub]

map is generally easier on inference than broadcast, so we may prefer these.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.69%. Comparing base (cfc2e58) to head (87e0376).
Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #211      +/-   ##
==========================================
- Coverage   89.74%   89.69%   -0.06%     
==========================================
  Files          11       11              
  Lines        1112     1126      +14     
==========================================
+ Hits          998     1010      +12     
- Misses        114      116       +2     

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