Encoding Fixes

The `data` element was useless in serialization.

Also, no need to explicitly calculation the non-intersection -- can be derived.