Some further compiler optimizations