small renaming and cleanup; first stab (as yet untested) at translating to a naive OpenCL implementation.