Improve hyphen range parsing