Bug 404077:  Adjust annotations of expected assertions.  CLOSED TREE