Some encapsulation optimizations.