Removed/disabled some more of the HLint warnings