Improve hygiene of newtype_index
#67898
+80
−52
Merged
newtype_index
#67898