Eliminate few remaining uses of typeService