Solidified dependency on commander-completion