Minor refactoring in DrawingSurfaceSoftware