Related: this is a massive class file.  Would it hurt to move to new files, or are you relying on `private`?