Attempt to fix some unused variable warnings.
Merge branch 'flint-2.4' into trunk