Refactoring Rule composition with an eye towards adding more SingleValueRules