Fix completion on opts and cmds

/cc @cody-