Ongoing visualizer cleanup.