Use Vecs and Segs instead of tuples
Revert "Use Vecs and Segs instead of tuples"

This reverts commit f3a3c9a7cf7c29344aa0711d7197a2189f9afc97.