OK, Codex seemed to do a decent job of fixing up the accessibility, I just shipped its changes: https://github.com/simonw/tools/issues/36