More hyphen consistency, bug 26685