Likely these could be null per your other changes.