ROOT 5597 and ROOT 5840 offset clarification and interface change.