Refactor 2-D lifting for speed

More than 3x speedup. Is now faster than fft.