Use type as declared in the kernel class:

- this fixes an issue when literals of wrong type are implicitly casted
Cleanup.