Refactor to remove the need to list commands with uncompletable args