Handle tuples and tuple types correctly

Some syntactic constructs are still vague
Regenerate output
Update documentation