And then, property tests are more likely to be possible, and IMO should be preferred!
test driven re-design?