Convolve2 refactor (stage 2)