[PATCH imagefactory 4/5] Remove some unnecessary substitutions.