Minor cleanup based on Resharper; added class stub for Maybe monad.