kleisli: Refactor as independent feature