range-diff: move the diffopt initialization down one layer