Merged `yaml-plus` mode into `yaml`