More fixes for QuickCheck 2.7