Remove sink forcing; rely on improved code-gen.