Some refactoring at svg to model converter.