Handle optimization options better.