This is an example of when a V2 would have been appropriate but unfortunately this is already a V2 so I've tried to use the existing code...

I may be missing something but I don't see there's much benefit in rewriting this condition?