Partial conversion to optimistic form, not yet including the type policy work