Fixes optional hyphens.
Merge branch 'optional-hyphen-cleanup'