Fix completions of composed options