Remove a few more null checks that aren't needed.