More Code Contract fixes.