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

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