Yaml parsing related refactorings, in connection with issue #12