Handle hyphens better.