more OrderedDict.
Don't warn for dict of size 1.

This was creating warning in the tests.