Implemented agustines suggestions around x ? x : z -> x || z