shell: Improve storage sort orders.

Fixes #1210