macroexp--warn-and-return message tweak (bug#13132)