Add support for spot removal presets.

Here is a fix for having the spot removal presets working.

Please review carefully, I'm not sure it is the best way to fix this but I did not found a better solution. At least this patch set is relatively small.