Move away from shapeless.