Restore frame excerpts to images

A better fix would be to lift the inContext call up a few levels, and
also fix inContext to know about formats.  This will come back to haunt
us, probably, but is fine for now, since videos in context are always
videos.

Fixes #2333