Fix regressions in Raster caused by faulty merge.