> Yes, but if I reach that buffer from a query for s-foo, which was
> in the completions list, and then decide, from there, that I want
> s-bar instead, I'll be confused if it isn't in the completion list.

Yes, shorthands make life a bit more complex.
I don't think there's much we can do about that.