Benjamin Otte authored Nov 03, 2019 and Matthias Clasen committed May 30, 2020

Instead of 6 vfuncs, we now have 3 and rely on the factory keeping track
of what it needs to do.

We're doing lots of dancing from one object to another here, but this
will hopefully get simpler with further commits.