ENG-5712: Fix dumb refactoring that broke inner classes.