Merge "Various cleanups in the drag viz code."