Some more compiler performance optimizations