Second round of HLint fixes.

No functional changes. Mostly removing redundant do/parentheses/$.