Commit prior to simplifying set_call