Actually, there are some things in the unordered code that aren't ready for trunk, so I'll rename the branch and create another one to be added to trunk later.