First pass at a better strategy for scrubbing post-hyphen phrases from entity names.
Second attempt at hyphen improvements; I'm preserving this for posterity but it actually turned out not to be very good.
Good-enough hyphen rewrite, with new tests.
Revert "Second attempt at hyphen improvements; I'm preserving this for posterity but it actually turned out not to be very good."

This reverts commit e724cba6737eb785b8a86801a9419485ac1d7021.
Merge commit 'ceb5cfe' into hyphens