Optimizer changes.