Merge "Fix overlap between scalar and vector usage of functions."