More improvements in type propagation