Optimizer cleanups.