Update to work with the latest libmasochist