Fix the parsing of hyphens with no surrounding whitespace.

Closes #1030