Use derived-mode-p in previous change