Do not declare unused variables
Do not declare unused variables

The variables are declared and set, but only used in blocks that have
been commented out because currently broken.

Let's move the broken block to include sites where the variables are
declared and set.

GNOME/at-spi2-core,GNOME/at-spi2-core,GNOME/at-spi2-core