Merge "Use conventional args style for gen_jarjar"