Adapt for Charmonizer CLI changes.
Regen charmonizer for CLI changes.