Switch to monad-control, bump to 0.6