Issue #5854: Updated __all__ to include some missing names and remove some names which should not be exported.