more fixups

Also implement the new 'V2/3' interface for completion. Older plugins
are proxied.

Change-Id: Ifdc876ae0f1893a43217e0e7e57e922f4686afd8