Don't expand the tuples in code, which makes error handling a little less ugly