Update to new versions of alloy/kodkod with more fixes.