Treat args consistently for call and yield