(picture-substitute): Use command remapping instead of