Support dashes in tokens (fixes #678)