Handle timeout from depsolver

Also includes a couple of small cleanups.

Does the error message seem right?