Merge "Fix a bug in type propagation."