Changes to support the new Teaspoon API

Also cleaned up some unused code, arguably the resolver could be deleted
as well, as this is done by the console runner internally and isn't
needed.