Rejig rasterize-related files a bit