Better handling of no-sink case, or no sink file