Feedback indicated it is worth to unify the existing mess with an abstract foundation, with otherwise no negative reactions. As such, I propose to go through with this.
My memory is a bit hazy here, but I thought Milan was working on merging this in. Milan?