Normalize kwarg syntax