A separate commit - even after this one is merged - would be fine. Maybe it's not worth worrying about, but do you think CompletionContext is better than CompletionKind? (if not, I'm fine with ignoring my original comment). In general, I just prefer to see one term rather than two - unless we really are describing two different things.