Additional internal optimizations