Ever more access modifier fixes.