Updates as per Feedback

Based on discussion at https://github.com/reactive-streams/reactive-streams/pull/41