More scratch-buffer cleanup
diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc
index eafa68e..ba80136 100644
--- a/src/hb-coretext.cc
+++ b/src/hb-coretext.cc
@@ -553,7 +553,7 @@
   } HB_STMT_END;
 
   unsigned int scratch_size;
-  int *scratch = buffer->get_scratch_buffer (&scratch_size);
+  hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
 
 #define ALLOCATE_ARRAY(Type, name, len) \
   Type *name = (Type *) scratch; \
@@ -657,8 +657,7 @@
 
     buffer->ensure (buffer->len + num_glyphs);
 
-    unsigned int scratch_size;
-    int *scratch = buffer->get_scratch_buffer (&scratch_size);
+    scratch = buffer->get_scratch_buffer (&scratch_size);
 
     /* Testing indicates that CTRunGetGlyphsPtr, etc (almost?) always
      * succeed, and so copying data to our own buffer will be rare. */