Does anyone see anything messy about this patch? I decided to post this JFSAG, and if anyone wanted to avoide the trouble of resolving a couple minor rejects. -- Core