Eliminate use of ctors that take vectors.