Fix issues with dashes not being stripped properly (and thus turning into names, oops).