Replace more tuples with (mathematical) Vectors where applicable