More flexible internal vector and pair types