Fix some incorrect uses of the ok macro where the result depends on