Avoiding the nascar problem, as discussed on the mailing list
Making changing to wording suggested by the SFC