Make sure ehval_p pretends it's never nullptr, and remove some checks that are no longer needed