Merge "Rewrite TypeLookupTable."