Golf down some Maybe / Monad stuff.
Merge pull request #564 from LeifW/golf

Golf down some Maybe / Monad stuff.