Make it work with recent spoon changes.