Gah. Fix pkg-descr to point to the new location, too, along with a
few other cleanups.