Yes, there will need to be some rewriting - that PR (and the two that depend on it) change so much, that I am running out of stuff I can reasonably do before they are merged.