Fixing-up API to remove unnecessary exports.