Fixed Tuple type parameters now that compiler bug is fixed