Merge "Replace hand written offsets with structures."