Minor mods in anticipation of separate electron density equation.