WIP SI-7678 Use RunDefintions more widely

As this moves some members around in Defintions, I'm checking
how we go with PR validation.