Finish moving to a static class and clean up WP_DEBUG warnings