Move more type check infrastucture over to resolution