OK, done in #1848; will rebase as soon as that passes