More minor cleanups of strategy.