Update according to o11c coding review, untested.