Finish compacting giant type-conversion-strings if tree, updating to new upstream...