More work on bug #8138.  Image editing now totally works.