Are you sure these conditions are required?  Are they tested?  I ask because I don't think the old implementation had them.

Also, this comment cannot be automatically converted.