Little code refactoring.
Add support for vectorized / unvectorized kernels.