cleanups after a second rebase.  Really need to do a proper squash soon.