Fix incompatibilities with recent package.el changes.