We can probably take out this TODO - nobody's complained about the regexp.