Completion: move careful handling of mix of positional and non-positional items

[pacak]

Extracted from #337

• track shell completions origin - named or positional and use similar to other completions
• when combining completions from two branches - use both or use one that captured earlier value