Another fix to magic arg handling