Isn't marking all the following methods as private a too invasive change?