=str #15755 #15756 source and sink

sorry, deleted the old branch by accident, previous discussion was at #15786 
I tried to add the type to the Source/Sink in my first attempt, and that was indeed bloated.
I suggest to change it to `Option[Any]`, since it is not needed by all.