I think that looks good, but I don't know what DerivativeRequest is. Do you know how/why VisualEditor introduced a need to check for it here?