McMillan-Mayer theory of solutions revisited: simplifications and extensions.