Updates for impending shapeless and Scala releases.