Cleanup commonplace lint errors