Cleaned up the hisq force test code a little to eliminate some
compilation warnings about unused functions/variables.