I merged because it wasn't worth holding it up over more bikeshedding.  But what do you think of changing the name of `fromRaster` to `rasterDia`?