Remove the logic for reasoning about NaNs from the code that forms