Round of clean-up in Tuples directory. (Skipping TupleExpansion?, which will be fused together later.)