FLEX-34098 and FLEX-33985:  Fix more cases in the discretionary hyphens workaround