Shapeless 2.1 updates