Round out the treatment of the option monad.

Some new obvious rewrites, and the choice operator.