Minor code cleanup for strat code.