Optimize unmarshalling: add const and & variants of types to the
hashtable, instead of stripping them each time.