Moved the ResolveTypesPass back a bit.