Attempt to fix some unused variable warnings.