[A PR discussion](https://github.com/OpenZeppelin/zeppelin-solidity/pull/323#issuecomment-316987571) at Open-Zeppelin caught this. And [here](https://github.com/gotwarlost/istanbul/issues/290#issuecomment-148111366) is Istanbul on the same issue. I wonder if we could (reliably) pre-process / instrument these into conditionals somehow. . .