Minor code cleanup for strat code.
Merge branch 'master' into constraint-strat
More minor refactoring of stratification code.
Merge branch 'master' into constraint-strat
Merge.