#82: Optimizations.