Earlier, this was part of another MR, but that got split. Didn't pick
that commit, as there were many merge conflicts. Vim macros seemed faster.