Re: Add NonEmptyMap and NonEmptySet to containers