Merge "Remove offset pointer optimization in inftrees.c."