-cvPatMonoBind sf (RdrMatch srcline srcfun pat guardedexprs binding)
- = (pat, cvGRHSs srcfun sf srcline guardedexprs, cvBinds sf cvValSig binding)
+cvPatMonoBind sf (RdrMatch_NoGuard srcline srcfun pat expr binding)
+ = (pat, [OtherwiseGRHS expr (mkSrcLoc2 sf srcline)], cvBinds sf cvValSig binding)
+
+cvPatMonoBind sf (RdrMatch_Guards srcline srcfun pat guardedexprs binding)
+ = (pat, map (cvGRHS sf srcline) guardedexprs, cvBinds sf cvValSig binding)
+
+cvFunMonoBind :: SrcFile -> [RdrMatch] -> (RdrName {-VarName-}, Bool {-InfixDefn-}, [RdrNameMatch])
+
+cvFunMonoBind sf matches
+ = (head srcfuns, head infixdefs, cvMatches sf False matches)
+ where
+ (srcfuns, infixdefs) = mapAndUnzip get_mdef matches
+ -- ToDo: Check for consistent srcfun and infixdef