Minor cleanup of nwchemio and tests.