Oops, looks like diff changed out from under me - ignore :)