Fix church.ml: better operations, define ChurchBool type