Optimizations again.