With the new commit the primal variable switching supports oil/water cases. 

But for sure there are still lot of other places that do not support oil/water cases at the moment.