Switch to more sensible combined sink API