Make Cider more usable.
A few more Cider tweaks.