Switch to strict monad transformers