Finish up FEAT_* refactor.