Merge "Improve type propagation with if-contexts"