Also recognize both escaped and unescaped hyphens when parsing CFI