Changed generation of tuple values and types