Lint fixes

Appease the very opinionated lint gods.