Remove some null-checks due to infallible new, no bug, r=me