(Eclipse: Organize imports on save)
One more null awareness...
Switching to FM 2.3.21.