Fix overly aggressive type merging.