Trying to improve odict performance

Making a "safe" diff which only affects odict, no upstreaming...