J.R. S. answered 06/05/19
Ph.D. in Biochemistry with an emphasis in Neurochemistry/Neuropharm
I think that both previous definitions of molarity are a little confusing, because they speak of moles of solute per volume of solvent. I think it is best to define molarity as moles of solute per liter of SOLUTION. That way, if the solute actually contributes to the volume, it is accounted for in molarity.
Molality was defined appropriately by both previous answers.