More improvements to nwchem parsing.