Cleanup: Use the appropriate API for accessing the DIVariable of a