More work to replace AbstractPlottingSystem with IPlottingSystem.