All of the current tests pass. I was trying to decide whether to add new tests for this... The Firebug breakage is tricky to reproduce, since you need to add enough versions that the generated column gets truncated, and that has to happen right after the hyphen. In any case, it's all so dependent on the old (crazy) logic, that I don't think it's worth it.