Remove OrderedDict references from runner

Fixes #7256