Make functions ok with the new typing.