Merge "Fix a few comments in vectorization code that were incorrect or incomplete."