Remove old pathstack and fix some tests in test_resolve which still
assumed the older version.