Yep, this is what I was taking about, seems like redundant with your changes. But I wasn't exactly sure what your changes meant. So I just ported my original diff, for you to pick&choose.