Thist idea caused too intrusive changes to the code of call sites, I
think. Will do it another way that leaves call sites as is.

This reverts commit 25d114ee.