Add completion support for newer command arg types

Fixes #1477.