Code cleanup Description: Change some variables that are keywords in C++ to non-keywords. Platforms tested: FreeBSD 4.8 (sleipnir) too minor to require full h5committest