Update the messages only when *setting* index-limit.

  This is a performance *AND* correctness fix :)