small detail, but important - need to keep variables that got removed earlier.

Prior GCC cleanup removed them, but they're needed if libuninameslist used.