Follow up e1037b79df838125b9a3c334ecbb7ee3c5e6ccd6

Easier backwards compatibility, by simply deriving from a second new
base class.