Use NonEmptyList.nel
Fix shadowed type param warnings