K 10 svn:author V 6 obrien K 8 svn:date V 27 2002-04-23T20:30:30.000000Z K 7 svn:log V 132 Restore some of the original variable names, but fix the warnings their renaming addressed by removing the global variants instead. END