Argument passing should be more idiomatic.

[cjxgm]

Use copy instead of const reference for sink, for example.