Changes to implementation of Graphics.draw()