The attached patch only covers the offsets used in the current
implementations.