added better support for generic arg passthru