Fix typeMerge for scalar op vector types.

http://d.puremagic.com/issues/show_bug.cgi?id=9910