More OpenCL code cleanup using macros.