Rolling back larger refactor, pulling out phrases into groups