Switched to a fixed and more complete `OrderedDict` recipe. Fixes #4912.