Make clear_commit_marks() clean harder