And make the arguments match the expect ones.
The new shell provides an implementation of CcShell and also removes the dependency on libslab.