[TASK] Abstract out change_opt_check