Optimizer tweaks.