Fixes to accomodate latest liquid-fixpoint changes.