Significant refactor to move into new module strings-with-facets.