GH715: Missed some null-check-removals. follow commits 412bafdcf5, and 7c96dbcdab