core: tweaking private/internal exports