The biggest change in this series is the attribute slot counting code in patch 6, and some cleanups in patch 8. I think this isn't going to improve itself much more out of tree, Dave.