Another stint of refactoring, removing repetition in the ExecutionAction