Minor refactor.
Merge branch 'master' into constraint-strat