This library is responsible for ~25 interfaces and we're in the process of refactoring. So, refactoring out as much as possible just makes it easier in the long run.