Unreviewed expectation updates after r115846.