More Context.draw restructuring