I also prefer this.  It has a well known entry point, and it's obvious to the code reader what the object is for.  The tests also got easier.  Fixed with 22c5d07ded6d443c127ca5efd9433fc5a7aaa288