This set of fairly simple patches address a number of issues, and are needed for the next patch series, but not directly related to better tree matching. David