Cosmetic changes to make HLint happy