Merge "Factor vector unary/binary shared code out into superclass."