Updated to use comonad 3.2's cohoist