Move sink creation helpers to static methods

Moves standalone helpers into static members of respective sinks.
Merge branch 'develop'