Integrated tuple creator

Which meant that I could remove the restriction on the number of
captured variables