Fix arguments to skip_on_empty helper
3 files changed