More OpenCL code cleanup using macros.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  More OpenCL code cleanup using macros.