DataArray optionals (expansionOrigin, unit) none case fixes

Should fix issue #238, #239 and part of issue #233