Cleanup a bunch of HLint warnings