Various argcomplete changes (in progress)