More libespm-related changes.