WIP
Fix cut & paste error: do not emit right value twice in logical or.
WIP