convolve_fft() is used
when convolution is done with kernels. This is a stopgap solution for a bug
that we have yet to track down.
There are also some minor formatting changes in the code.