Revert "Revert "Tweaking of compiler optimizations""

This reverts commit ddae7b1c33bada68635d5d04fcbf30ad0a33fc28.