Finished refactoring remaining classes to use a single closure.