reactive-streams 0.4.0.M2 + very mechnical update of type params