HLint cleanups.