Some clean-up and added the non-monadic contribution.