I think the change I mentioned in WhereOptimizer [here] (https://github.com/forcedotcom/phoenix/pull/89/files#r3327726) will fix this.