Even more compliance changes for pull request.