Hi,

Here is a patch that removes some macros (ab)use in image-dired.  There
should be no functional changes with this patch.