Better handle partial additions and deletions. RE: #18/#20