Switch to `this`-preserving composition.

Fixes the remaining failing tests.