completion: fix __gitcomp_builtin no longer consider extra options