Eliminated some gratuitous changes from trunk.