Consistency with continuity in conservative advection schemes for free-surface modes