Rewrite generic_args for new generics syntax