More code changes...

Deprecate Sink<?> among others.