changes to make the compiler on our power3 happy
changes to make the compiler on our power3 happy

pyrovski/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,pyrovski/papi,pyrovski/papi,pyrovski/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi,arm-hpc/papi