Yeah, sorry @jdfreder , i saw something I wanted to fix, but then it turned into a rather bigger fix than I expected, so there'll probably be a few conflicts now. I think the improvements in #5326 will make this kind of extension easier to think about, though.