Ran through perltidy.
  Updated to avoid warnings.

  If we're running "make test" then there are warnings because the
 site-suffix isn't populated.  Although this is atypical it seems
 simpler to guard against the unused variable rather than updating
 the test-cases.