Any chance we can get patches 1-3 in soon as they should be fairly uncontroverial and easy to review. I'll probaby revisit patch 4 in coordination with Yunkai Zhang's patch series in this area.