Overhaul processsing of Graphics in edit()