More Context.draw streamlining