Fix the easier of the QuickCheck 2.7 breakages :-(
Fix build
Fix stupid thinko
Merge
Get tests working with now-mandatory QuickCheck 2.7