HLint cleanups