Add a fancy-indexing version...

and a command-line flag to switch between kernels.