Refactor entire file. Complete makeClosures().