Revert r206045, "Fix shift by constants for vector."

It broke some builders, at least, i686.
Whitespace.