QuickCheck fixes

The first patch is needed with QuickCheck 2.7.6, the second is to avoid using QC's internal MkProperty constructor because it may change in the future.