Issue20689: add missing API pieces to __all__