Minor tweaks to common OpenCL code.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Minor tweaks to common OpenCL code.