HLint fixes.

No functional changes. Mostly removing redundant parentheses/$.