Now including the correct metrics package for shading.  Fixes #1376.