bug 1010269: When generating offsets for toggling branches, use the correct one (r=dougc)