Refactoring Enumables again...