Remove Pair, improve Tuple constructors