Fixed redefinition of float4, etc.
Extended handling of opencl vector types. See examples in test/MapTests.