Fix non-public fn that some macros still need