[COMMIT] Be more reasonable in the implementation of #'make-modeline-command-wrapper.