Escape underscores in arg names