Fix up vector usage so that it works with both gcc-4.8 and earlier versions of
gcc.