Use the equation of state functions in a few more places in the gizmo code to be more robust to changes.