This is preparation for adding some linting checks for new commits from
people.  Shouldn't be any functional changes here (tests still pass!).