> I did it like this in order to ensure that previously existing code
> calling these functions works.

ok