Move expanded check into <cr-patch-file-message>.expand()