More Context.draw cleanup