Allow to complete also command shortcuts.

This isn't as flexible as it could be, but for the first this is enough to
complete the hardwired command shortcuts.