#4137 remove poor use of Tuple