I'd like to endorse this, and I hope this is considered; this seems like quite an improvement.
6/11 seems to have a functional change in it [adding IAgileObject], which may be correct but seems hidden and probably deserves a separate patch? Same with 11/11 apparently.