Never mind I retract the clean up patch. While doing the actual reordering is not that difficult I would need to retest and I don't have time for that now. And since reordering tends to requiring typing in everything again and I make occasional typos (and I added bugs in the past during such reordering exercises) the retesting would be needed. But for that clean up it is probably not worth it. After all it just makes the code a little nicer, but doesn't fix or improve anything. Please still consider the other patches in the serioes. -Andi --
