Drastic rewrites of raster clip. Need to test after lunch