Except what I did in https://github.com/hypothesis/annotator/commit/90a8a4f1d9a33390f331e2ca60365281780b7509, while this was all still inside the Adder plugin.