Push refactorings through OpenCL code that was disabled.  C backend passes 70/70.  OpenCL passes 43/48 but runs out of memory right now.