ruiu added a comment. I was trying to say is to merge the two classes. I'd remove VersionScriptParser class and move the members to ScriptParser, so that you don't need to "cross the boundary" to read a version element. https://reviews.llvm.org/D23660