Bug 683159:  Adjust annotations of expected assertions.  CLOSED TREE