Fixed bug in q2c when munging hyphenated strings.