Messages: improvements to the `generate` command