Bugfix: character sets

Correctly handle the case where a hyphen is the final member of the set: adding the character before the hyphen, and the hyphen, instead of just adding the hyphen twice.