clean up generics in Tuple.java