Fix some private type in public signature warnings.