#8725: Refactoring to simplifier classes