End of non-linting changes.