Undo style change which didn't work
Restore old code for scala tuple generation

With lowering introduced when generating field accessses for C
Trivial check file changes

Some new lines and different variable numbering due to lowerings.