packages/catacomb2/: Yay. Only one disastrous problem to fix.