Major refresh of shell-completion. Should help browsing available options a lot.

Closes #1641