Did the suggested get_or_create change (turns out create_enrollment does this anyway, so I made that more explicit), though I'm not sure what you mean about removing the update_enrollment call.