Merge "Bug 2999: Use normalized type in creation of simple JSON codecs."