Cleanup: hlint, cabal files and MonadBase

More misc cleanup. See the commit messages for details.