Rework Equation of state interface

There are too many versions floating around.

• Settle on one version.
• Test it.
• Document it.