Needed a small change to deal with the new tuple interface and some test updates.
See ghc!8820 (closed)