Move null logic to patch; add learnerState unset