I have one more patch, committed on the same branch as the other two commits from this thread.