Bug 24584: Rewrite optional/parameters to YAML