Make closure more lightweight