Preliminary monad-comprehension patch (Trac #4370)