Fixed (hopefully the last) linting errors.