Followup changes to addition of -fwarn-context-quantification (GHC Trac #4426)