am 0319f528: Merge "Replace hand written offsets with structures."

* commit '0319f528b2d94df89cb489905f7e1c65af511d75':
  Replace hand written offsets with structures.