viewerDynamicObjectMixin cleanup from dataSourceBrowser branch.