filter-branch doesn't care when commits are mingled and having four
'dead code removal' commits just to keep histories separate really
looks ugly.