HLint cleanup.