PIVOT-799, small changes to monad-related classes (still wip)

git-svn-id: https://svn.apache.org/repos/asf/pivot/trunk@1605290 13f79535-47bb-0310-9956-ffa450edef68