Take into account one more hidden pref.

This time, we add extra code to take into account the "signature_no_dashes"
option.