[minor] Avoid closure when not necessary