Minor clean up of cmd_clean() so that the remapped results are used.