This is fixed (along with all outstanding review comments).  I verified everything passes on ESR 24, which has the issue.