Towards #1330, making the function private