Minor code cleanup for strat.