Small refactor, fix manglers