I'm not sure I understand your comment, you want to add explicit checks to keep the current entry even though they would be kept by falling through the current checks to the keep line on 927?  I think I might be missing something.