Try to deal with some of the Tuple2 issues.