Less code.
Switching from list-operations on deltas and units to set-operations.

close #1