Random wartremover and lint cleanups
Merge pull request #735 from rorygraves/random_cleanup

Random wartremover and lint cleanups