HLint fixes.

Applied the conservative hlint fixes.