Move environment keys to be direct modifiers (work around Swift compiler bug in 5.2)
- this has the advantage of making the modifiers specific to collectionView vs tableView