Improved get-aliases, beginnings of expand-cli-tokens