"Simplify Pkg2.resolve" Take 2

@StefanKarpinski