Comment out some stuff temporarily.
Add new OpenCL constants and function stubs that we'll need.
Minor cleanups.  We don't have to define these.
Get rid of vestiges of the custom event listener stuff.