Updated the unused-variable hack.

  Using this should be more portable.