Add _U_ to some variables that might be unused