Bring up to modern linting

No functional changes.