I think the best course of action, in line with BT#577, is to use patches 1 and 2, which work fine, and not use 3 and 0004. I remember it being a long discussion to get that result and I wouldn't want to start all over again. Phyllis, what do you think?