pacman: more in-progress work on rebase.