EA-59548 (nullability)
Cleanup (minor optimization)