Post-HLint clean-up.