Factor static methods into object.
Inline evocations of static method.
Push state into object and inject through constructors.