Optimizer improvements.