There are many similar issues in this pull request.  Please fix them, too.