Some interface changes for AllOf/AnyOf.