BSD Commit Log Search

interfaces: further protect fallout triggered by 6ae356678dd

We can't be sure this won't happen again since the code makes
no effort to avoid such scenarios and happily moves on.  There's
probably more problematic code here down the line, but having
flushed out the other thing means we're on the right track.

(cherry picked from commit 4c4bdea7d4c21593272ae81e1c410ad6d8992072)

UnifiedSplitRaw