Yes, there are two commits in the pull request which are unrelated to putOrdered* -- issues I noticed while working on the code and didn't want to add separate pull requests for.  See the commit messages for details.