Make mlet macro non recursive.
Cosmetic fixes on state monad namespace.