* And add corresponding check to test suite.

* This will allow for merging the identical parts next.

* Now that the X/Y distinction is available for arithmetic, the offset can
  be computed.

* With the conversion of the other IDs it will be easier to iterate
  over these field programmatically.