Another closure refactor attempt.