More updates with OpenCl like coding
Fixes switch statement with constants.