Progress commit.
Cleanup some rebase garbage.