Small refactoring to avoid an unused variable warning.

  This is critical as we do now use -Werror