Cleaned up Tuple and TriTuple.