Fix warnings and errors in OrderedHash and NormalizedMap.