Issue #2359213: Port image-filling support.

Now with real tokens again instead of the fake D7 token! We look at metdata
and stuff to figure out if it's an image field token! For great profit!