Alan Zimmerman authored Mar 17, 2024 and Marge Bot committed Mar 20, 2024

- Introduce a helper lens to compose on `EpAnn a` vs `a` versions
- Rename some prime versions of functions back to non-prime
  They were renamed during the rework