expunge remaining uses of the Hinted type alias