I like how this ends up in nicer tests than the previous approach.