6be240e546
Other simplifications associated with structural testing. (CVS 6890) FossilOrigin-Name: 25dd342283046aaf66a679348ef1c7364c616402