Fix problems uncovered by standard tests.
React to upstream changes.
Try to deal with some of the Tuple2 issues.