Remove spurious NULL checks