Proper object-oriented code for pivot table hydration

Meh, `$this instanceof...` code...