Add completion support for newer command arg types

Fixes #1477.
Merge pull request #1479 from david-christiansen/issue/1477

Add completion support for newer command arg types