Move block/offset pointers into context structs