Type resolution redesign, with language changes to taste