Work around various problems caused by some of the monadification patches
not being applied.