better wiring for argument-specific completions