Refactor assistants handling to throw away the stupid CustomYamlAssistant class and work with instances of YamlAssistant