Update typeof references to use itypeof