Repaired more of the damage caused by my rebasing.