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

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