[legibility] Rework class instantiation for actions and stores to be more legible