Wait, wait.  Sorry, ignore what I was saying about options.  Misread the WQL.  Yours is right.