Thermodynamic modeling of concentrated aqueous electrolyte and nonelectrolyte solutions