Merge "Prevent integer underflows in ID3::Iterator"