Improve nwchem parsing.