No longer removes source kwarg if same as field name